OSDN Git Service
Greg Plesur [Thu, 9 Feb 2017 19:49:58 +0000 (19:49 +0000)]
Allow any device with a device_owner to execute setDeviceOwnerSystemPropertyLocked().
am:
735b4dc0af
Change-Id: Iafcc772f7f9c8111d26ebc48af67e104848e0885
Jeff Sharkey [Thu, 9 Feb 2017 19:45:35 +0000 (19:45 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
78f2e38a12 -s ours am:
b30169299b -s ours
am:
31c7fa003d -s ours
Change-Id: I69602a5fbca3fd966c2bc8ab900b004308ce5f41
Jeff Sharkey [Thu, 9 Feb 2017 19:41:31 +0000 (19:41 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
78f2e38a12 -s ours
am:
b30169299b -s ours
Change-Id: Iac47439b256367683e44d09042996ad060c3c43d
Jeff Sharkey [Thu, 9 Feb 2017 19:37:23 +0000 (19:37 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID.
am:
78f2e38a12 -s ours
Change-Id: I51385a2b84bfc4e0fa387ceb644be523ca55ced3
Paul Duffin [Thu, 9 Feb 2017 19:32:58 +0000 (19:32 +0000)]
Merge "Partial Revert "Replace com.android.internal.util.Predicate with java.util.function.Predicate"" am:
621ebe692f
am:
a2c92b0b88
Change-Id: I605588603280ff0b4ebc1088c6c1f1c933c1e657
Paul Duffin [Thu, 9 Feb 2017 19:28:25 +0000 (19:28 +0000)]
Merge "Partial Revert "Replace com.android.internal.util.Predicate with java.util.function.Predicate""
am:
621ebe692f
Change-Id: Ifc6e7ac4f4a1bfc8c592d3b956ac985e9dd6e0ea
Paul Duffin [Thu, 9 Feb 2017 19:18:34 +0000 (19:18 +0000)]
Merge "Partial Revert "Replace com.android.internal.util.Predicate with java.util.function.Predicate""
Jeff Sharkey [Wed, 30 Nov 2016 21:29:59 +0000 (14:29 -0700)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID.
A recent security fix prevents the system UID from handing out Uri
permission grants directly from itself. Instead, services need to
issue grants as the original calling UID to ensure that the caller
actually has access to the Uris.
Test: builds, boots, send/recv MMS works in primary/secondary users
Bug:
33231106
Change-Id: Ia9fe19843b52977c8a94ee5349b907beda1882fc
Merged-In: Ia9fe19843b52977c8a94ee5349b907beda1882fc
(cherry picked from commit
7ff418d9a9afb9ecf42f87fffd3e65477decb55e)
Jeff Sharkey [Thu, 9 Feb 2017 17:44:19 +0000 (17:44 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
a78841ebd4 -s ours am:
be0dab477e am:
47656a3cbd
am:
99755cb458
Change-Id: Ia8c7e13f716b2007298b1773f00f338f665c7678
Jeff Sharkey [Thu, 9 Feb 2017 17:39:14 +0000 (17:39 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
3eddf40675
am:
14b308de91
Change-Id: I3ae65230058cd51b4efb06358dae35dce419c04b
Jeff Sharkey [Thu, 9 Feb 2017 17:37:47 +0000 (17:37 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
a78841ebd4 -s ours am:
be0dab477e
am:
47656a3cbd
Change-Id: I5835528fe288b1ee117265d37e39fcfd0bbb301b
Jeff Sharkey [Thu, 9 Feb 2017 17:33:51 +0000 (17:33 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
a78841ebd4 -s ours
am:
be0dab477e
Change-Id: I28971e3707b67f7f3e4a566fd4f8e891d7e8823b
Jeff Sharkey [Thu, 9 Feb 2017 17:33:43 +0000 (17:33 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID.
am:
3eddf40675
Change-Id: Ied7f446ac2e539654b9f7d5e1ab7cce8aec7390e
Jeff Sharkey [Thu, 9 Feb 2017 17:28:44 +0000 (17:28 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID.
am:
a78841ebd4 -s ours
Change-Id: Iac6ae6f87a60318e4557b238c196c3b0627e95ab
Greg Plesur [Thu, 9 Feb 2017 16:06:24 +0000 (11:06 -0500)]
Allow any device with a device_owner to execute setDeviceOwnerSystemPropertyLocked().
BUG:
34824902
Change-Id: I95fbe0a352c48a3fff5af57b91325901a16d3d89
Paul Duffin [Thu, 9 Feb 2017 14:47:53 +0000 (14:47 +0000)]
Partial Revert "Replace com.android.internal.util.Predicate with java.util.function.Predicate"
This partially reverts commit
3e5fbca0c57742f28f5c7e6bda6c3500b9471b47.
Bug:
35187548
Bug:
30188076
Bug:
35089332
Test: make checkbuild
Change-Id: I7ab4279aab604e3d56003b0a59867948aebabd28
Martijn Coenen [Thu, 9 Feb 2017 08:47:12 +0000 (08:47 +0000)]
Merge "Don't generate and send reply object in oneway calls." am:
60f11f3d16
am:
14cc9c291e
Change-Id: I415b895812703aa8ec290234fb71d1d0a89aece9
Martijn Coenen [Thu, 9 Feb 2017 08:42:27 +0000 (08:42 +0000)]
Merge "Don't generate and send reply object in oneway calls."
am:
60f11f3d16
Change-Id: I790576158c1d2cae6b746f3b5d0dbecad750629a
Martijn Coenen [Thu, 9 Feb 2017 08:37:29 +0000 (08:37 +0000)]
Merge "Don't generate and send reply object in oneway calls."
Martijn Coenen [Wed, 8 Feb 2017 09:22:28 +0000 (10:22 +0100)]
Don't generate and send reply object in oneway calls.
Bug:
35044790
Test: hidl_test, hidl_test_java
Change-Id: Iae8f5b071f89d2af5ca15360c6a1a0fbf8040e77
Greg Plesur [Wed, 8 Feb 2017 23:44:34 +0000 (23:44 +0000)]
Merge "Don't check device_provisioned on Wear devices in setDeviceOwnerSystemPropertyLocked()" into cw-f-dev
am:
8a2ea2cf83
Change-Id: Ie25c9bfa82ccffc58b68c13b515d7f556d955289
Greg Plesur [Wed, 8 Feb 2017 23:44:27 +0000 (23:44 +0000)]
Don't check device_provisioned on Wear devices in setDeviceOwnerSystemPropertyLocked()
am:
c7b18342ea
Change-Id: I1969d32950057ecacc03e8c5d00ad185fb627044
TreeHugger Robot [Wed, 8 Feb 2017 23:36:06 +0000 (23:36 +0000)]
Merge "Don't check device_provisioned on Wear devices in setDeviceOwnerSystemPropertyLocked()" into cw-f-dev
Tyler Gunn [Wed, 8 Feb 2017 22:01:07 +0000 (22:01 +0000)]
Merge "Change prototype for "setCamera" in IMS VideoProvider." am:
c164b159f8
am:
e55b11573e
Change-Id: Iffef42c4050bbda451e9cd99cb90589060b105bd
Tyler Gunn [Wed, 8 Feb 2017 21:56:39 +0000 (21:56 +0000)]
Merge "Change prototype for "setCamera" in IMS VideoProvider."
am:
c164b159f8
Change-Id: I3abbb1de951f65c226a6849f34946880e9f650ff
Treehugger Robot [Wed, 8 Feb 2017 21:46:43 +0000 (21:46 +0000)]
Merge "Change prototype for "setCamera" in IMS VideoProvider."
Greg Plesur [Wed, 8 Feb 2017 19:57:34 +0000 (14:57 -0500)]
Don't check device_provisioned on Wear devices in setDeviceOwnerSystemPropertyLocked()
BUG:
34824902
Change-Id: I49d4d7043829862e1abacb3f400a6690f454d6c0
Roshan Pius [Wed, 8 Feb 2017 21:01:12 +0000 (21:01 +0000)]
Merge changes If970d851,I5bd11574 am:
3c054697fc
am:
65eef762a9
Change-Id: I02a05b3b327b79f9b344db0a3b5d5c96b49bcd5a
Roshan Pius [Wed, 8 Feb 2017 21:00:24 +0000 (21:00 +0000)]
WifiManager: API upates for O am:
fb441f5009
am:
aabb1c7ecf
Change-Id: I0ff9ca3f59b4d10e41fd2d3a38329cc7f71844cf
Roshan Pius [Wed, 8 Feb 2017 20:59:17 +0000 (20:59 +0000)]
WifiConfiguration: Remove priority field am:
45491113ed
am:
51641c20b2
Change-Id: I820420e7c38aac3ddff2441cf40dc367b483c0ff
Roshan Pius [Wed, 8 Feb 2017 20:50:02 +0000 (20:50 +0000)]
Merge changes If970d851,I5bd11574
am:
3c054697fc
Change-Id: I2794ca0e7dfaaf10a47862a4646483772a530b5e
Roshan Pius [Wed, 8 Feb 2017 20:49:57 +0000 (20:49 +0000)]
WifiManager: API upates for O
am:
fb441f5009
Change-Id: I00207a5219d97c49b1231610ad78f7ec4cbe0b96
Roshan Pius [Wed, 8 Feb 2017 20:49:13 +0000 (20:49 +0000)]
WifiConfiguration: Remove priority field
am:
45491113ed
Change-Id: I2dd6f7f7b1912259b646a715049164b48334d5b4
Treehugger Robot [Wed, 8 Feb 2017 20:38:12 +0000 (20:38 +0000)]
Merge changes If970d851,I5bd11574
* changes:
WifiManager: API upates for O
WifiConfiguration: Remove priority field
songjinshi [Wed, 8 Feb 2017 20:22:26 +0000 (20:22 +0000)]
Merge "[Debug]: Add timeout for dumpNativeBacktraceToFile." am:
b6f7a85b85
am:
ec69bd0aa3
Change-Id: Idfe455733dd12bf82c31cb505681e4fa89d57bfb
songjinshi [Wed, 8 Feb 2017 20:18:13 +0000 (20:18 +0000)]
Merge "[Debug]: Add timeout for dumpNativeBacktraceToFile."
am:
b6f7a85b85
Change-Id: Iea79127b2c7d823844406f677a98fea54043f4cb
Treehugger Robot [Wed, 8 Feb 2017 20:11:22 +0000 (20:11 +0000)]
Merge "[Debug]: Add timeout for dumpNativeBacktraceToFile."
Erik Wolsheimer [Wed, 8 Feb 2017 19:46:50 +0000 (19:46 +0000)]
DO NOT MERGE Guard against null entries in process list during updateOomAdjLocked
am:
84aa5a864f
Change-Id: I9b5c9b25a9bd4ad5b51f7d0c7004c7275ce1e460
Paul Duffin [Wed, 8 Feb 2017 18:30:17 +0000 (18:30 +0000)]
Merge "Replace com.android.internal.util.Predicate with java.util.function.Predicate" am:
78a20be77a
am:
9e99b9ee45
Change-Id: I289950cff0cdc6b5ad301936c7b55eadee5fd0f8
Paul Lawrence [Wed, 8 Feb 2017 18:29:08 +0000 (18:29 +0000)]
Merge "Expand seccomp whitelist" am:
fd77a331eb
am:
1201ce98dd
Change-Id: I87fa2d6962ebb288c8c79488cfaf73485fca7bbf
Tyler Gunn [Wed, 8 Feb 2017 18:27:37 +0000 (18:27 +0000)]
Merge "Add support for wait-on-handlers command." am:
da6d683caa
am:
a3b4985ad4
Change-Id: I80669c442c53a49687974851dccf0c9c9b500e96
Paul Duffin [Wed, 8 Feb 2017 18:14:50 +0000 (18:14 +0000)]
Merge "Replace com.android.internal.util.Predicate with java.util.function.Predicate"
am:
78a20be77a
Change-Id: I6f32dc27f70e4c22d25ec6bd2eec715700ebbd89
Paul Lawrence [Wed, 8 Feb 2017 18:10:28 +0000 (18:10 +0000)]
Merge "Expand seccomp whitelist"
am:
fd77a331eb
Change-Id: I824c984b907e43248d6eba6259f31f4aab7d64db
Paul Duffin [Wed, 8 Feb 2017 18:06:07 +0000 (18:06 +0000)]
Merge "Replace com.android.internal.util.Predicate with java.util.function.Predicate"
Paul Lawrence [Wed, 8 Feb 2017 17:57:41 +0000 (17:57 +0000)]
Merge "Expand seccomp whitelist"
Tyler Gunn [Wed, 8 Feb 2017 17:17:30 +0000 (17:17 +0000)]
Merge "Add support for wait-on-handlers command."
am:
da6d683caa
Change-Id: I71bee35ec1bf6ff4100f6515ea87dcc89312a689
Roshan Pius [Fri, 3 Feb 2017 20:51:40 +0000 (12:51 -0800)]
WifiManager: API upates for O
Deprecate the following API's:
1. pingSupplicant() - We don't want apps trying to figure out if
wpa_supplicant is running or not. It should not be something that
apps need to know.
2. saveConfiguration() - No longer needed, we automatically persist data
when needed.
Other changes:
1. Reworded the docstrings to remove direct reference to wpa_supplicant
for network configuration related API's.
2. We no longer allow apps to modfiy network configuration of other
apps. Added a docstring explaining that in the 3 modify API's.
3. Changed the wording of enableNetwork's |disableOthers| flag.
Bug:
31146757
Test: make update-api
Change-Id: If970d85146de3532072191cb2b7ecb0d5adb2774
Roshan Pius [Tue, 24 Jan 2017 22:58:34 +0000 (14:58 -0800)]
WifiConfiguration: Remove priority field
This field is no longer used anywhere within wifi framework and hence
removing this from public API.
Bug:
28341078
Test: make update-api
Change-Id: I5bd115742ca610735b00c20f2ffab7590c5f3256
Paul Lawrence [Wed, 8 Feb 2017 16:26:56 +0000 (08:26 -0800)]
Expand seccomp whitelist
Bug:
35059702
Test: Device boots, app no longer produces SIGSYS failures
Change-Id: I020b625bd7529ad9806c0b23a1ca70bc87906dad
Tyler Gunn [Wed, 8 Feb 2017 16:09:09 +0000 (16:09 +0000)]
Merge "Add support for wait-on-handlers command."
Paul Duffin [Wed, 8 Feb 2017 11:35:19 +0000 (11:35 +0000)]
Merge "Fix problem with JavaDoc" am:
8f33fcdc4b
am:
4929aafc1d
Change-Id: I08c9f20c34a2952105854d107b442884dba220b1
Paul Duffin [Wed, 8 Feb 2017 11:31:15 +0000 (11:31 +0000)]
Merge "Fix problem with JavaDoc"
am:
8f33fcdc4b
Change-Id: I25fd01b35a2c1299304401a1333f737ee9252317
Treehugger Robot [Wed, 8 Feb 2017 11:21:28 +0000 (11:21 +0000)]
Merge "Fix problem with JavaDoc"
Paul Duffin [Wed, 8 Feb 2017 09:14:46 +0000 (09:14 +0000)]
Fix problem with JavaDoc
Test: make checkbuild
Change-Id: Ia321e0a57ff63aa62adee16d611c063a22807176
Erik Wolsheimer [Wed, 8 Feb 2017 04:54:20 +0000 (20:54 -0800)]
DO NOT MERGE Guard against null entries in process list during updateOomAdjLocked
BUG:
34312358
Change-Id: I9b303d443b082bba8b440e6e1ef68b050a970386
Tyler Gunn [Wed, 30 Nov 2016 23:14:26 +0000 (15:14 -0800)]
Change prototype for "setCamera" in IMS VideoProvider.
Changing "setCamera" prototype to include the uid.
Test: Unit test, manual test.
Bug:
32747443
Merged-In: I7e6eb617d724972b0fcbd2f9a27f5c3ee91efd2d
Change-Id: I7e6eb617d724972b0fcbd2f9a27f5c3ee91efd2d
Peter Qiu [Tue, 7 Feb 2017 23:47:46 +0000 (23:47 +0000)]
Merge changes from topic 'Passpoint API Rename' am:
93d66c83cf
am:
322c9a9ec5
Change-Id: I91231f6c6ad804997071f81f0d3998f1d8231a73
Peter Qiu [Tue, 7 Feb 2017 23:40:45 +0000 (23:40 +0000)]
hotspot2: expose Passpoint APIs as public am:
bffe405e1f
am:
b898025e8c
Change-Id: I10d77f87722d5b21004df1394b1b5d9e82b78976
Peter Qiu [Tue, 7 Feb 2017 23:39:50 +0000 (23:39 +0000)]
hotspot2: fix class/function/variable names to comply with API guideline am:
da8a67e8a6
am:
7fec249699
Change-Id: Ib37832f30b5174f52e71ef2e3f796c669ba7bda9
Peter Qiu [Tue, 7 Feb 2017 23:38:36 +0000 (23:38 +0000)]
hotspot2: rename classes to comply with API guideline am:
a77809766c
am:
c4f4a1ac9e
Change-Id: I00cda97fa573cb7dcb3ac8501ead6b34b91f1b1e
Peter Qiu [Tue, 7 Feb 2017 23:38:35 +0000 (23:38 +0000)]
Merge changes from topic 'Passpoint API Rename'
am:
93d66c83cf
Change-Id: Ibff6d79c8ca51b760932909e89b21e8c843acc89
Peter Qiu [Tue, 7 Feb 2017 23:32:08 +0000 (23:32 +0000)]
hotspot2: expose Passpoint APIs as public
am:
bffe405e1f
Change-Id: I86065439f5902b6ce7b0ceec3f295e14f0dff47f
Peter Qiu [Tue, 7 Feb 2017 23:31:02 +0000 (23:31 +0000)]
hotspot2: fix class/function/variable names to comply with API guideline
am:
da8a67e8a6
Change-Id: I48f7b3ab747c0323aec5208c7a0afa123ff68729
Peter Qiu [Tue, 7 Feb 2017 23:30:19 +0000 (23:30 +0000)]
hotspot2: rename classes to comply with API guideline
am:
a77809766c
Change-Id: Iaaf34a5ec744775e472d1b3eb8673ebf610b1c61
Treehugger Robot [Tue, 7 Feb 2017 23:25:02 +0000 (23:25 +0000)]
Merge changes from topic 'Passpoint API Rename'
* changes:
hotspot2: expose Passpoint APIs as public
hotspot2: fix class/function/variable names to comply with API guideline
hotspot2: rename classes to comply with API guideline
Paul Lawrence [Tue, 7 Feb 2017 23:03:32 +0000 (23:03 +0000)]
Merge "Expand seccomp whitelist" am:
10e7aed13f
am:
0ab0d47516
Change-Id: Id7512df1f0df56f73352c82a3ad55eb5360ebd91
Paul Lawrence [Tue, 7 Feb 2017 22:59:34 +0000 (22:59 +0000)]
Merge "Expand seccomp whitelist"
am:
10e7aed13f
Change-Id: I8060b31a8ac20ddd77b7139c5a3bbd8d146dbc27
Paul Lawrence [Tue, 7 Feb 2017 22:50:43 +0000 (22:50 +0000)]
Merge "Expand seccomp whitelist"
Brad Ebinger [Tue, 7 Feb 2017 22:37:31 +0000 (22:37 +0000)]
Merge "Perform camera permission and app ops check when setting camera for VT." am:
ed5c217fc0
am:
3d6f878b75
Change-Id: I0ed577718d9ffd72ec7668889d4da4db0060cb5f
Brad Ebinger [Tue, 7 Feb 2017 22:33:05 +0000 (22:33 +0000)]
Merge "Perform camera permission and app ops check when setting camera for VT."
am:
ed5c217fc0
Change-Id: I0fd4ed2260a9654e2889121022192f62f86a3d0c
Brad Ebinger [Tue, 7 Feb 2017 22:26:43 +0000 (22:26 +0000)]
Merge "Perform camera permission and app ops check when setting camera for VT."
Peter Qiu [Wed, 1 Feb 2017 04:08:38 +0000 (20:08 -0800)]
hotspot2: expose Passpoint APIs as public
Bug:
34862444
Test: frameworks/base/wifi/tests/runtests.sh
Test: frameworks/opt/net/wifi/tests/wifitests/runtests.sh
Change-Id: I8bf5c715b9088c673e59a73a78e18f6e6b64d1d1
Peter Qiu [Thu, 2 Feb 2017 18:25:05 +0000 (10:25 -0800)]
hotspot2: fix class/function/variable names to comply with API guideline
Bug:
34862444
Test: frameworks/base/wifi/tests/runtests.sh
Test: frameworsk/opt/net/wifi/tests/wifitests/runtests.sh
Change-Id: Ide425c06be46bc41c8f601e732dca0543de096b1
Peter Qiu [Thu, 2 Feb 2017 18:22:16 +0000 (10:22 -0800)]
hotspot2: rename classes to comply with API guideline
This is purely a file rename operation.
Bug:
34862444
Test: None
Change-Id: I297a228f3ee7e09c9cce5ca9f677eb1db478fd46
songjinshi [Fri, 16 Dec 2016 09:48:21 +0000 (17:48 +0800)]
[Debug]: Add timeout for dumpNativeBacktraceToFile.
If the debuggerd be blocked, the watchdog and
activitymanager thread will be blocked when the
ANR or watchdog occurs,so we needed to add
timeout for dumpNativeBacktraceToFile.
Change-Id: Iab1a64328e70257025d860638d93a4fb8eaaeea2
Signed-off-by: songjinshi <songjinshi@xiaomi.com>
Paul Duffin [Tue, 7 Feb 2017 15:04:10 +0000 (15:04 +0000)]
Replace com.android.internal.util.Predicate with java.util.function.Predicate
Bug:
35089332
Bug:
30188076
Test: make checkbuild
Merged-In: I0a5b4bf520fc39b59d8d790b01e9cff0d54e6d21
Change-Id: I58e4e35e7b7315033d893748f7c79e1ba6732f39
Paul Lawrence [Tue, 7 Feb 2017 16:18:03 +0000 (08:18 -0800)]
Expand seccomp whitelist
Bug:
34979910
Test: System boots, app runs
Change-Id: I8b60a24ac855679251e73edcdec57eb4af4a5610
Tyler Gunn [Tue, 7 Feb 2017 04:47:04 +0000 (20:47 -0800)]
Add support for wait-on-handlers command.
Add support for wait on handlers adb telecom command. Used in CTS
tests to ensure work is completed once all Telecom handlers have finished
their current work.
Test: CTS, Manual
Bug:
34159263
Change-Id: I14acc0a04710b445c172629c2327813ee73a5a55
Jeff Sharkey [Wed, 30 Nov 2016 21:29:59 +0000 (14:29 -0700)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID.
A recent security fix prevents the system UID from handing out Uri
permission grants directly from itself. Instead, services need to
issue grants as the original calling UID to ensure that the caller
actually has access to the Uris.
Test: builds, boots, send/recv MMS works in primary/secondary users
Bug:
33231106
Change-Id: Ia9fe19843b52977c8a94ee5349b907beda1882fc
(cherry picked from commit
7ff418d9a9afb9ecf42f87fffd3e65477decb55e)
Jeff Sharkey [Wed, 30 Nov 2016 21:29:59 +0000 (14:29 -0700)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID.
A recent security fix prevents the system UID from handing out Uri
permission grants directly from itself. Instead, services need to
issue grants as the original calling UID to ensure that the caller
actually has access to the Uris.
Test: builds, boots, send/recv MMS works in primary/secondary users
Bug:
33231106
Change-Id: Ia9fe19843b52977c8a94ee5349b907beda1882fc
(cherry picked from commit
7ff418d9a9afb9ecf42f87fffd3e65477decb55e)
Andreas Huber [Tue, 7 Feb 2017 00:12:13 +0000 (00:12 +0000)]
Merge "Fixes Treble marshaling of strings embedded in structures from Java" am:
97fca8c035
am:
0bae9b1406
Change-Id: I0eb29e3e80243a958aa2520924ea9ad859034cdf
Pavlin Radoslavov [Tue, 7 Feb 2017 00:10:21 +0000 (00:10 +0000)]
Merge "Add a mechanism to configure the default A2DP codec priorities" am:
acf34d8b62
am:
cd6e0ee19d
Change-Id: I6fb8a3a35451cf2d1e228466ef4a4d4e89d1d4ca
Jason Monk [Tue, 7 Feb 2017 00:09:14 +0000 (00:09 +0000)]
Merge "Hotspot Tile: longclick should open Tethering settings" am:
96c4f1a21e
am:
4e82bf6c51
Change-Id: I39d311e1b455a7a3e53ac8c1b12d1d67b07972ee
Miao Wang [Tue, 7 Feb 2017 00:08:05 +0000 (00:08 +0000)]
Merge "Remove uncessary dependency of libhwui" am:
df36be5f17
am:
eebd7d7970
Change-Id: I3e7b282340259eaad71569e8a15f5028852852ee
Jack Yu [Tue, 7 Feb 2017 00:04:04 +0000 (00:04 +0000)]
Merge "Renamed voiceNetworkStateChanged and dataNetworkStateChanged" am:
84f97e21b2
am:
7eac8ec7c1
Change-Id: I8fdb5f13a50a0965cb2fbfd15212bc26e076054c
Tyler Gunn [Tue, 7 Feb 2017 00:01:04 +0000 (00:01 +0000)]
Merge "Self managed CS implementation." am:
d736a6b2c2
am:
6bd991b3d2
Change-Id: Id406ceb476573d3cebc12ce27652d814dd679733
Andreas Huber [Mon, 6 Feb 2017 23:45:53 +0000 (23:45 +0000)]
Merge "Fixes Treble marshaling of strings embedded in structures from Java"
am:
97fca8c035
Change-Id: Iac2492ccc736b83d6ae46022b643fd229c2c307e
Treehugger Robot [Mon, 6 Feb 2017 23:41:27 +0000 (23:41 +0000)]
Merge "Fixes Treble marshaling of strings embedded in structures from Java"
Pavlin Radoslavov [Mon, 6 Feb 2017 23:12:23 +0000 (23:12 +0000)]
Merge "Add a mechanism to configure the default A2DP codec priorities"
am:
acf34d8b62
Change-Id: I8a97b344bb09f4bded076ea81875b3b78dc50bea
Jason Monk [Mon, 6 Feb 2017 23:03:24 +0000 (23:03 +0000)]
Merge "Hotspot Tile: longclick should open Tethering settings"
am:
96c4f1a21e
Change-Id: I42b701c8d390333f6d121bea2ee6c3284e646e9c
Treehugger Robot [Mon, 6 Feb 2017 22:59:50 +0000 (22:59 +0000)]
Merge "Add a mechanism to configure the default A2DP codec priorities"
Aaron Whyte [Mon, 6 Feb 2017 22:57:30 +0000 (22:57 +0000)]
Merge "Prevent division-by-zero error when calculating battery capacity." into cw-f-dev
am:
50fa8ad424
Change-Id: I3306d389c19a42130bda31cb61bc846207b76c35
Ying Wai (Daniel) Fan [Mon, 6 Feb 2017 22:57:23 +0000 (22:57 +0000)]
Prevent division-by-zero error when calculating battery capacity.
am:
415f8b32e8
Change-Id: I1337db6391a9511df52560e8edb8a09260e27c5f
Miao Wang [Mon, 6 Feb 2017 22:56:58 +0000 (22:56 +0000)]
Merge "Remove uncessary dependency of libhwui"
am:
df36be5f17
Change-Id: I5ccce1f195a43ff00b9bd7fc350d7ae915c566d7
Jason Monk [Mon, 6 Feb 2017 22:53:58 +0000 (22:53 +0000)]
Merge "Hotspot Tile: longclick should open Tethering settings"
Aaron Whyte [Mon, 6 Feb 2017 22:49:32 +0000 (22:49 +0000)]
Merge "Prevent division-by-zero error when calculating battery capacity." into cw-f-dev
Tyler Gunn [Wed, 9 Nov 2016 18:19:23 +0000 (10:19 -0800)]
Perform camera permission and app ops check when setting camera for VT.
When a calling InCallService attempts to use the setCamera API on the
VideoCall, Telecom will perform a permission check to ensure that the
caller has the correct camera permission and passes the app-ops camera
check. A failure to set the camera will result in a callback via the
call session event API.
This got a little messy as the app ops package name needs to come from the
InCallService, and handler usage in the VideoProvider API means we had to
pass around the uid/pid of the caller, obtained before we trampoline onto
the handler.
Test: Unit tests added, manual testing performed.
Bug:
32747443
Change-Id: I555a04f9c3fb45e60bb811f64ba855ccf2e3b0e2
Miao Wang [Mon, 6 Feb 2017 22:47:15 +0000 (22:47 +0000)]
Merge "Remove uncessary dependency of libhwui"
Jack Yu [Mon, 6 Feb 2017 22:47:05 +0000 (22:47 +0000)]
Merge "Renamed voiceNetworkStateChanged and dataNetworkStateChanged"
am:
84f97e21b2
Change-Id: Ib35393c60b0800d21507bd5d8ffe35345e6e6926
Treehugger Robot [Mon, 6 Feb 2017 22:41:10 +0000 (22:41 +0000)]
Merge "Renamed voiceNetworkStateChanged and dataNetworkStateChanged"