OSDN Git Service
Hugo Benichi [Sat, 22 Apr 2017 00:49:19 +0000 (00:49 +0000)]
Merge "NsdManager: add unit tests" am:
dc54ad7fc3
am:
40ab8401b2
Change-Id: Ie8b30310a8da64e6247472fa17945d003b1894e8
Hugo Benichi [Sat, 22 Apr 2017 00:40:56 +0000 (00:40 +0000)]
Merge "NsdManager: add unit tests"
am:
dc54ad7fc3
Change-Id: I928f19e359b7423d43d792c413de4195a64141a7
Hugo Benichi [Sat, 22 Apr 2017 00:31:27 +0000 (00:31 +0000)]
Merge "NsdManager: add unit tests"
Hall Liu [Sat, 22 Apr 2017 00:19:47 +0000 (00:19 +0000)]
Merge "Remove default public ctor from RttModifyStatus" am:
d065cf049e
am:
cb93ac533d
Change-Id: I3e34e7bbebf2e4bfd12c0562d32037ece5c43ff6
Hall Liu [Sat, 22 Apr 2017 00:14:14 +0000 (00:14 +0000)]
Merge "Remove default public ctor from RttModifyStatus"
am:
d065cf049e
Change-Id: Ie4afbc705810b3f370fb8e8d57be9053c6135083
Treehugger Robot [Sat, 22 Apr 2017 00:01:50 +0000 (00:01 +0000)]
Merge "Remove default public ctor from RttModifyStatus"
Robert Greenwalt [Fri, 21 Apr 2017 23:29:47 +0000 (23:29 +0000)]
Merge "Mark Restricted APN connections as restricted." am:
b90b2015d3
am:
1778682242
Change-Id: I2300c5e98b8e3339825bfac7ea1f6d514b5ae71f
Robert Greenwalt [Fri, 21 Apr 2017 23:23:17 +0000 (23:23 +0000)]
Merge "Mark Restricted APN connections as restricted."
am:
b90b2015d3
Change-Id: Icd54c671035da752663d9ec125f999298aa1d8e7
Treehugger Robot [Fri, 21 Apr 2017 23:12:51 +0000 (23:12 +0000)]
Merge "Mark Restricted APN connections as restricted."
Robin Lee [Fri, 21 Apr 2017 22:11:05 +0000 (22:11 +0000)]
Merge "Use Vpn rules (not firewall) for always-on VPN" am:
e4f56a7e44
am:
cd8557d15a
Change-Id: I4e0aa1a88c259b77d7a9ac9e1dd02566e415005d
Robin Lee [Fri, 21 Apr 2017 22:05:33 +0000 (22:05 +0000)]
Merge "Use Vpn rules (not firewall) for always-on VPN"
am:
e4f56a7e44
Change-Id: I80b3607fd1c61875be8354439e09db56a0bd391d
Robert Greenwalt [Mon, 10 Apr 2017 21:32:23 +0000 (14:32 -0700)]
Mark Restricted APN connections as restricted.
If anything unrestricted is bundled in the whole thing has to be
unrestricted (we can't restrict based on destination or intent)
but the NOT_METERED flag wasn't taken into account.
This wasn't a problem before because telephony set that statically
and late, but a change caused it to be marked NOT_METERED earlier
which exposed this bug.
bug:
37208956
Merged-In: I7b7a1c38621ce0ecde8cf041e82b1ebb7a9c6f15
Test: new NetworkCapabilitiesTest. Fails without fix, works with.
Change-Id: I86c1b2854413a94662aa53e697d32380695ab9ac
Treehugger Robot [Fri, 21 Apr 2017 21:53:14 +0000 (21:53 +0000)]
Merge "Use Vpn rules (not firewall) for always-on VPN"
Hall Liu [Fri, 21 Apr 2017 21:33:12 +0000 (14:33 -0700)]
Remove default public ctor from RttModifyStatus
Test: builds
Bug:
37515063
Change-Id: I1e573d945b48e28d12621078cc8f37eb076d9ee3
Jakub Pawlowski [Fri, 21 Apr 2017 20:43:55 +0000 (20:43 +0000)]
Merge "Bluetooth: improve getLeMaximumAdvertisingDataLength comment" am:
c8d5f84fcf
am:
e00b92e550
Change-Id: I6805a973e91ac16cfc5d1c30567df04e7ed98ba2
Jakub Pawlowski [Fri, 21 Apr 2017 20:38:00 +0000 (20:38 +0000)]
Merge "Bluetooth: improve getLeMaximumAdvertisingDataLength comment"
am:
c8d5f84fcf
Change-Id: Ieec563c19e318e6ffc0716009d554a11ff9f4847
Jakub Pawlowski [Fri, 21 Apr 2017 20:28:44 +0000 (20:28 +0000)]
Merge "Bluetooth: improve getLeMaximumAdvertisingDataLength comment"
Jakub Pawlowski [Fri, 21 Apr 2017 11:59:55 +0000 (04:59 -0700)]
Bluetooth: improve getLeMaximumAdvertisingDataLength comment
Bug:
37534792
Test: none
Change-Id: Ieff71356aceb0e2a4c6e81d9053f854448e0c927
Jordan Liu [Fri, 21 Apr 2017 18:30:29 +0000 (18:30 +0000)]
Merge "Use SubscriptionId instead of SubId" am:
946410eef5
am:
9cad054e02
Change-Id: Ib57abfadda3521667ce788e37e77496300feef4e
Jordan Liu [Fri, 21 Apr 2017 18:23:00 +0000 (18:23 +0000)]
Merge "Use SubscriptionId instead of SubId"
am:
946410eef5
Change-Id: Ib6f689a69ff19b24cc5ac128e77254c0d7624161
Jordan Liu [Fri, 21 Apr 2017 18:17:51 +0000 (18:17 +0000)]
Merge "Use SubscriptionId instead of SubId"
Meng Wang [Fri, 21 Apr 2017 16:38:13 +0000 (16:38 +0000)]
Merge "Fix error message: getAllowedCarriers" am:
112d039dfb
am:
03f4a0f034
Change-Id: If62a8b9d7b4a2c36d20cdb00877563a5586a5f72
Meng Wang [Fri, 21 Apr 2017 16:32:12 +0000 (16:32 +0000)]
Merge "Fix error message: getAllowedCarriers"
am:
112d039dfb
Change-Id: Ic04b23b87f56261c2c55f1e0a284109bf353c8d0
Treehugger Robot [Fri, 21 Apr 2017 16:23:33 +0000 (16:23 +0000)]
Merge "Fix error message: getAllowedCarriers"
Erik Kline [Fri, 21 Apr 2017 09:13:16 +0000 (09:13 +0000)]
Merge "Clarify IControlsTethering LOCAL_ONLY state name" am:
649c459858
am:
f7c93bcd45
Change-Id: I7eab6f5027628711381b09188779cad164910f51
Erik Kline [Fri, 21 Apr 2017 09:07:46 +0000 (09:07 +0000)]
Merge "Clarify IControlsTethering LOCAL_ONLY state name"
am:
649c459858
Change-Id: Ia856b08ced4e26e32e107faac37e1c245caaf910
Erik Kline [Fri, 21 Apr 2017 08:59:30 +0000 (08:59 +0000)]
Merge "Clarify IControlsTethering LOCAL_ONLY state name"
Hugo Benichi [Mon, 17 Apr 2017 06:27:52 +0000 (15:27 +0900)]
NsdManager: add unit tests
This prepares some refactoring and the addition of a timeout to
resolveService.
Test: new tests pass
Bug:
37013369,
33298084
Change-Id: Ie8277bd5983278507bfa70495b4ce7d13895b24b
Hugo Benichi [Fri, 21 Apr 2017 02:16:20 +0000 (02:16 +0000)]
Merge "Add BitUtils (from "Support multiple filters per association request")" am:
1321e592fe
am:
232198d02b
Change-Id: I755f87e0dbe8169de01ea5cd09094eed3555ee65
Erik Kline [Thu, 20 Apr 2017 13:59:16 +0000 (22:59 +0900)]
Clarify IControlsTethering LOCAL_ONLY state name
Test: as follows
- build
- flashed
- booted
- "runtest frameworks-net" passes
- manually starting tethering shows Settings and icon updates
Bug:
31466854
Bug:
32163131
Change-Id: I1f45511f00aca37480f894be4a9a004f1a3b35d7
Hugo Benichi [Fri, 21 Apr 2017 02:09:14 +0000 (02:09 +0000)]
Merge "Add BitUtils (from "Support multiple filters per association request")"
am:
1321e592fe
Change-Id: Ibe263aeb2868b75f0a7a75895c68a5aaf2ddfa38
Hugo Benichi [Fri, 21 Apr 2017 01:58:14 +0000 (01:58 +0000)]
Merge "Add BitUtils (from "Support multiple filters per association request")"
Stanley Tng [Fri, 21 Apr 2017 01:30:21 +0000 (01:30 +0000)]
Merge "Allow the Bluetooth MAC address to be updated asynchronously (2/3)" am:
c5680c9b05
am:
16609dfe18
Change-Id: I9c9c500bab98168da48d69cc7e4c93a33b8571bd
Stanley Tng [Fri, 21 Apr 2017 01:25:00 +0000 (01:25 +0000)]
Merge "Allow the Bluetooth MAC address to be updated asynchronously (2/3)"
am:
c5680c9b05
Change-Id: I63e35a957feb76517fb7559ecb6ac114109341ee
Treehugger Robot [Fri, 21 Apr 2017 01:16:31 +0000 (01:16 +0000)]
Merge "Allow the Bluetooth MAC address to be updated asynchronously (2/3)"
Stanley Tng [Tue, 18 Apr 2017 05:35:45 +0000 (22:35 -0700)]
Allow the Bluetooth MAC address to be updated asynchronously (2/3)
There are intermittent issues where either the returned Bluetooth
MAC address to Java framework is uninitialized or this address update
arrives too late. This fix will do 2 things:
(1) Returns error when MAC address is unavailable in the native code.
(2) Updates the MAC address later by adding a new broadcast event.
Test: Check address for these cases: factory reset, system reboot, and
Bluetooth re-enable.
Bug:
36709382
Change-Id: I09720193e38fdf9139e1bb146f8e1847e2b65b1a
Yang Ni [Thu, 20 Apr 2017 22:53:05 +0000 (22:53 +0000)]
Merge "Validates Intrinsic Blur only takes 2D Allocations" am:
b44f4d2f51
am:
0962a6e83c
Change-Id: I0b3c582cc9627567b4942eead98cdb0a2406d7c6
Yang Ni [Thu, 20 Apr 2017 22:47:34 +0000 (22:47 +0000)]
Merge "Validates Intrinsic Blur only takes 2D Allocations"
am:
b44f4d2f51
Change-Id: Ib2f8f8206fb77fad99c67d48b839231108e8d0cc
Yang Ni [Thu, 20 Apr 2017 22:37:20 +0000 (22:37 +0000)]
Merge "Validates Intrinsic Blur only takes 2D Allocations"
Colin Cross [Thu, 20 Apr 2017 18:20:43 +0000 (18:20 +0000)]
Merge "Convert libinputservice to Android.bp" am:
a070e55e34
am:
4ad5543b38
Change-Id: Ie902bac8bbca5663241a1d7651693930e06e8bf4
Colin Cross [Thu, 20 Apr 2017 18:12:45 +0000 (18:12 +0000)]
Merge "Convert libinputservice to Android.bp"
am:
a070e55e34
Change-Id: Iec35b80b29b3802f3cc4323eea5ece37bb445977
Treehugger Robot [Thu, 20 Apr 2017 17:59:45 +0000 (17:59 +0000)]
Merge "Convert libinputservice to Android.bp"
Jordan Liu [Thu, 20 Apr 2017 17:11:57 +0000 (10:11 -0700)]
Use SubscriptionId instead of SubId
Update the api to use SubscriptionId instead of SubId.
Fixes:
35766624
Test: Existing unit tests pass
Change-Id: I6f99da3bf533cab74f5ec81aac4f62e63d55378a
Merged-In: I6f99da3bf533cab74f5ec81aac4f62e63d55378a
Wenting Xiong [Thu, 20 Apr 2017 16:57:31 +0000 (16:57 +0000)]
Merge "DO NOT MERGE. SystemUI: Display RAT icon when data is off" am:
a0cef3c9c1 -s ours
am:
8bb42caffb -s ours
Change-Id: I44fad7c2f04f01257cdc2873243657cac744bf22
Wenting Xiong [Thu, 20 Apr 2017 16:51:41 +0000 (16:51 +0000)]
Merge "DO NOT MERGE. SystemUI: Display RAT icon when data is off"
am:
a0cef3c9c1 -s ours
Change-Id: I5da0dee9e45352370b6b38c6995be080415d5588
Treehugger Robot [Thu, 20 Apr 2017 16:39:36 +0000 (16:39 +0000)]
Merge "DO NOT MERGE. SystemUI: Display RAT icon when data is off"
Erik Kline [Thu, 20 Apr 2017 15:54:32 +0000 (15:54 +0000)]
Merge "Switch to WifiManager.{start,stop}SoftAp()" am:
275edcb940
am:
11fdd1769b
Change-Id: If43782074b323a7e2da4315ca342a3706d510959
Erik Kline [Thu, 20 Apr 2017 15:50:19 +0000 (15:50 +0000)]
Merge "Switch to WifiManager.{start,stop}SoftAp()"
am:
275edcb940
Change-Id: I697bf530da9786da4ed1405ac8b44b7bc4d097a6
Treehugger Robot [Thu, 20 Apr 2017 15:37:29 +0000 (15:37 +0000)]
Merge "Switch to WifiManager.{start,stop}SoftAp()"
Wenting Xiong [Tue, 7 Feb 2017 11:12:27 +0000 (19:12 +0800)]
DO NOT MERGE. SystemUI: Display RAT icon when data is off
Introduce customization and implementation to display RAT icon in status
bar even when data is off. Since some carriers require, this feature is
necessary.
Test: Test with simulated RIL
Bug:
28805511
Change-Id: I412a407b8bcfeb9b3caf265bc7e0331a88433725
Erik Kline [Thu, 20 Apr 2017 13:00:52 +0000 (13:00 +0000)]
Merge "Add local-only hotspot info into tether state change broadcast" am:
4c7a999d79
am:
6af3dd0fc3
Change-Id: Icef7c38313576219b4a55eb10648297b18597ef6
Erik Kline [Thu, 20 Apr 2017 12:55:48 +0000 (12:55 +0000)]
Merge "Add local-only hotspot info into tether state change broadcast"
am:
4c7a999d79
Change-Id: I911be691b15604a63aa02bf4db607ae1cd701cfe
Hugo Benichi [Thu, 20 Apr 2017 12:53:22 +0000 (12:53 +0000)]
Merge "ConnectivityManager: remove obsolete callback types" am:
458f75ef69
am:
23ee1621c7
Change-Id: Ib7ff014bd0b7729ca2d02956c190f368963ff632
Treehugger Robot [Thu, 20 Apr 2017 12:47:53 +0000 (12:47 +0000)]
Merge "Add local-only hotspot info into tether state change broadcast"
Hugo Benichi [Thu, 20 Apr 2017 12:47:44 +0000 (12:47 +0000)]
Merge "ConnectivityManager: remove obsolete callback types"
am:
458f75ef69
Change-Id: I180b5ae5890172f14dd910ce3ef3d1c907e3475b
Hugo Benichi [Thu, 20 Apr 2017 12:38:27 +0000 (12:38 +0000)]
Merge "ConnectivityManager: remove obsolete callback types"
Erik Kline [Mon, 17 Apr 2017 07:47:23 +0000 (16:47 +0900)]
Add local-only hotspot info into tether state change broadcast
Test: as follows
- build
- flashed
- booted
- "runtest frameworks-net" passes
- manually starting tethering shows Settings and icon updates
Bug:
31466854
Bug:
32163131
Change-Id: I938074587dfeec221c5cdb43a392802ad3fc3589
Erik Kline [Thu, 20 Apr 2017 04:47:16 +0000 (04:47 +0000)]
Merge "Make tetherChangePermission to be secured for AppOps permission" am:
fe86a197a1
am:
0d1f04384f
Change-Id: I8c0d0037bace2b9a3992e78dc0f853b92a8e0484
Hugo Benichi [Thu, 20 Apr 2017 04:40:34 +0000 (04:40 +0000)]
Merge "ConnectivityManager: unify prety printing of callback types." am:
0a4dc6a5d2
am:
3a0e92fada
Change-Id: Ie639f2c9685f19ef00ddb4ac937e6e9576998b80
Erik Kline [Thu, 20 Apr 2017 04:38:16 +0000 (04:38 +0000)]
Merge "Make tetherChangePermission to be secured for AppOps permission"
am:
fe86a197a1
Change-Id: Iee0af54745c3341b2aeeee05690e0377cb807ad9
Hugo Benichi [Thu, 20 Apr 2017 04:35:22 +0000 (04:35 +0000)]
Merge "ConnectivityManager: unify prety printing of callback types."
am:
0a4dc6a5d2
Change-Id: Ifa2d9455b666c068b13973eb1dee2bfb97b7d446
Erik Kline [Thu, 20 Apr 2017 04:28:52 +0000 (04:28 +0000)]
Merge "Make tetherChangePermission to be secured for AppOps permission"
Hugo Benichi [Thu, 20 Apr 2017 04:28:43 +0000 (04:28 +0000)]
Merge "ConnectivityManager: unify prety printing of callback types."
Colin Cross [Thu, 20 Apr 2017 00:00:07 +0000 (17:00 -0700)]
Convert libinputservice to Android.bp
See build/soong/README.md for more information.
Test: m -j checkbuild
Change-Id: I3cd2bb05ec89c40ebd1240e352a19f99d00dc114
Merged-In: I3cd2bb05ec89c40ebd1240e352a19f99d00dc114
(cherry picked from commit
3fc8f2df3098a5bb8191cca43b4dc4cf3bba160b)
Eugene Susla [Fri, 24 Feb 2017 02:24:39 +0000 (18:24 -0800)]
Add BitUtils (from "Support multiple filters per association request")
This patch is a cherry-pick of the BitUtils class from commit
36e866b8e0ec08e45b5e7fbc65aeeb3a9bb7b11e.
(cherry picked from commit
36e866b8e0ec08e45b5e7fbc65aeeb3a9bb7b11e)
Test: none
Change-Id: Iaf33929f6841db273a92d650e84287bf2964fa3d
Merged-In: I0a978787551a1ee5750ec5544b241d3bbfed5a7c
Hugo Benichi [Thu, 23 Mar 2017 13:40:44 +0000 (22:40 +0900)]
ConnectivityManager: remove obsolete callback types
This patch also:
- suppresses callback triggers from ConnectivityService for these
obsolete callback types.
- marginally refactors callCallbackForRequest().
Test: runtest frameworks-net
Change-Id: Idfb75640732943c599de4975f252f706d21ad594
Hugo Benichi [Wed, 22 Mar 2017 08:07:57 +0000 (17:07 +0900)]
ConnectivityManager: unify prety printing of callback types.
And also remove some small code duplication (checkNotNull).
Test: built, flashed, runtest frameworks-net
Change-Id: Id6c13bca9d12f70b88806032e0a4fa198efbedc6
Jakub Pawlowski [Wed, 19 Apr 2017 21:44:50 +0000 (21:44 +0000)]
Merge "Expose LE advertiser address for easier PTS tests (1/6)" am:
f2e6988350
am:
fc99848b96
Change-Id: Ie3ded1b0237b56bb4c81ad7a51c50b82267bc536
Jakub Pawlowski [Wed, 19 Apr 2017 21:39:11 +0000 (21:39 +0000)]
Merge "Expose LE advertiser address for easier PTS tests (1/6)"
am:
f2e6988350
Change-Id: I5b494f00fb88381a7caf95aa206e2fcd373c7129
Jakub Pawlowski [Wed, 19 Apr 2017 21:33:43 +0000 (21:33 +0000)]
Merge "Expose LE advertiser address for easier PTS tests (1/6)"
Jakub Pawlowski [Wed, 19 Apr 2017 13:52:08 +0000 (06:52 -0700)]
Expose LE advertiser address for easier PTS tests (1/6)
This patchset adds a hidden method getOwnAddress, that lets app with
BLUETOOTH_PRIVILEGED permission to lear their own addreess. This is done
exclusively for PTS tests.
Bug:
35147497
Test: manual
Change-Id: Iaf0f2fe0613de44b8430ac25e691d66a4ad44f8d
Zheng Zhang [Wed, 19 Apr 2017 18:31:30 +0000 (18:31 +0000)]
Merge "DO NOT MERGE ANYWHERE: Move content from verison 123 to 122, and skip verison 123." into cw-f-dev am:
5b84ba3b15 -s ours
am:
74b8c15d2b -s ours
Change-Id: I8f4523d90480e3b56bf223468ba42157fe6e97eb
Zheng Zhang [Wed, 19 Apr 2017 18:26:33 +0000 (18:26 +0000)]
Merge "DO NOT MERGE ANYWHERE: Move content from verison 123 to 122, and skip verison 123." into cw-f-dev
am:
5b84ba3b15 -s ours
Change-Id: Ic447d9ee4910f467e8ca6dad7d02693846e4fab8
TreeHugger Robot [Wed, 19 Apr 2017 18:21:43 +0000 (18:21 +0000)]
Merge "DO NOT MERGE ANYWHERE: Move content from verison 123 to 122, and skip verison 123." into cw-f-dev
Meng Wang [Wed, 19 Apr 2017 18:00:50 +0000 (11:00 -0700)]
Fix error message: getAllowedCarriers
Test: make
Change-Id: I0ee74f34f31742f2bf979dd9158ed22d56d64e5e
Jeff Hao [Wed, 19 Apr 2017 17:30:06 +0000 (17:30 +0000)]
Merge "Handle shared libraries for split apks." am:
9487dff8ab
am:
dae160f51b
Change-Id: I3b8fd7be7bf987858df229cfd95ca8d4dc170b54
Jeff Hao [Wed, 19 Apr 2017 17:21:36 +0000 (17:21 +0000)]
Merge "Handle shared libraries for split apks."
am:
9487dff8ab
Change-Id: I3414ba72ba8e3c3fc2d169a2a892c851d2577f3b
Treehugger Robot [Wed, 19 Apr 2017 17:13:11 +0000 (17:13 +0000)]
Merge "Handle shared libraries for split apks."
Zheng Zhang [Wed, 19 Apr 2017 01:16:33 +0000 (18:16 -0700)]
DO NOT MERGE ANYWHERE: Move content from verison 123 to 122, and skip verison 123.
HFP profile config landed late in Emerald development, and was committed
as version 122 there.
When it merged to master, there were conflicts since 122 was already
taken, so it was resolved as version 123.
We didn't catch the subtle bug then:
This means Emerald devices will reset HFP profile config in error once
they upgrade to Feldspar.
Correct this by merging 122, and making 123 a no-op.
Bug:
37338202
Change-Id: Ibf4c824d27300641fd1bb15f5884baf056bd8d7e
Jakub Pawlowski [Wed, 19 Apr 2017 16:13:50 +0000 (16:13 +0000)]
Merge "Read by UUID for PTS tests (1/5)" am:
7826c08e21
am:
0c9c0969cc
Change-Id: Ia850b9ad1d0d2e92a2c987c2c1cd24a44f7cfb3f
Jakub Pawlowski [Wed, 19 Apr 2017 16:04:45 +0000 (16:04 +0000)]
Merge "Read by UUID for PTS tests (1/5)"
am:
7826c08e21
Change-Id: I380a38460b1e00f405fdde0683c40dbc9c5b3807
Tetsutoki Shiozawa [Wed, 16 Mar 2016 14:30:57 +0000 (23:30 +0900)]
Make tetherChangePermission to be secured for AppOps permission
Symptom:
AppOps verified the incorrect package of calling tether state
changing API.
It threw SecurityException by mistake.
Solution:
Pass the correct package name to enforceTetherChangePermission.
Bug:
32931147
Change-Id: Ia1167f26f556678b189a24a4a716f1a7e5cb12eb
Treehugger Robot [Wed, 19 Apr 2017 06:08:48 +0000 (06:08 +0000)]
Merge "Read by UUID for PTS tests (1/5)"
Jeff Hao [Thu, 6 Apr 2017 00:09:59 +0000 (17:09 -0700)]
Handle shared libraries for split apks.
As we dexopt all the code paths of a package, we now append the code
paths to the list of shared libraries. These paths are passed as
relative paths since the apks are staged during installation, and are
not where they will be at runtime.
Part of a multi-project change.
Bug:
34169257
Test: cts-tradefed run singleCommand cts -d --module
CtsAppSecurityHostTestCases -t android.appsecurity.cts.SplitTests
Merged-In: I73823ca575560cbd445d78a6cfbfc72031943265
(cherry-picked from commit
16d4843433e024100b4ecd183f827ad5bd8772a6)
Change-Id: I943bf8234899e1b25d4eb5e98af15d9150a7a842
Jaewan Kim [Tue, 18 Apr 2017 23:40:54 +0000 (23:40 +0000)]
Merge "Add callback for AVRCP 1.6 support" am:
58b5789cde
am:
16e5c08cbd
Change-Id: Ie38c7ea468285625a6a0e88d5abfe43bb977b504
Jaewan Kim [Tue, 18 Apr 2017 23:37:26 +0000 (23:37 +0000)]
Merge "Add callback for AVRCP 1.6 support"
am:
58b5789cde
Change-Id: I13633358bb5fbc0bb52808d2e9213434cc27546f
Treehugger Robot [Tue, 18 Apr 2017 23:25:25 +0000 (23:25 +0000)]
Merge "Add callback for AVRCP 1.6 support"
Yang Ni [Tue, 18 Apr 2017 21:04:55 +0000 (14:04 -0700)]
Validates Intrinsic Blur only takes 2D Allocations
Bug:
24555166
Test: RSTest on x86_64 emulator
Change-Id: I0c8c970ce85989c3213fb4986e517ac0be5beb26
nharold [Tue, 18 Apr 2017 22:02:48 +0000 (22:02 +0000)]
Merge changes from topic 'ipsec-hide-overloads' am:
fe358c6adf
am:
8508bc52d2
Change-Id: I114e0175d72cdbabf47ed230b2971b57a6c210f1
Nathan Harold [Tue, 18 Apr 2017 22:01:32 +0000 (22:01 +0000)]
Consistenly Throw IOExceptions from IpSecManager am:
0bfb207532
am:
5db180bbb7
Change-Id: I85ec1413eff50887853f13fa02dcc461071fb210
nharold [Tue, 18 Apr 2017 21:51:25 +0000 (21:51 +0000)]
Merge changes from topic 'ipsec-hide-overloads'
am:
fe358c6adf
Change-Id: Ia28149a13cae7b5bdcb6f41d1f6cd4d37fbaf88b
Nathan Harold [Tue, 18 Apr 2017 21:50:30 +0000 (21:50 +0000)]
Consistenly Throw IOExceptions from IpSecManager
am:
0bfb207532
Change-Id: I42f4526b43a8de19178a23e5106596f94050c1d4
Jakub Pawlowski [Fri, 14 Apr 2017 14:21:20 +0000 (07:21 -0700)]
Read by UUID for PTS tests (1/5)
Add a hidden api for reading characteristic by UUID for PTS.
Bug:
35150313
Test: sl4a GattReadTest.byUuid
Change-Id: Ice4076d99e4694d20374ba0fdcae74d5ae841147
Jaewan Kim [Fri, 3 Feb 2017 07:21:38 +0000 (16:21 +0900)]
Add callback for AVRCP 1.6 support
Bug:
33828042
Test: Build
Change-Id: Iaf5cecfa38065cfeed096929952559d7cb2e248b
Erik Wolsheimer [Tue, 18 Apr 2017 20:09:31 +0000 (20:09 +0000)]
DO NOT MERGE Mask case of base or tree permission being null am:
cb8a640cef
am:
28fc6a28aa
Change-Id: Ia0dab8845a34753ed46199462a9e12c25f9a615f
Erik Wolsheimer [Tue, 18 Apr 2017 20:03:46 +0000 (20:03 +0000)]
DO NOT MERGE Mask case of base or tree permission being null
am:
cb8a640cef
Change-Id: I43289a33b8e1e6df9307cd11891feff4d739da14
Erik Wolsheimer [Tue, 18 Apr 2017 16:27:31 +0000 (09:27 -0700)]
DO NOT MERGE Mask case of base or tree permission being null
Bug:
34850544
Change-Id: I4bf9e85d7e615ccdb75752503e58d7e7f47b04c2
nharold [Tue, 18 Apr 2017 18:35:20 +0000 (18:35 +0000)]
Merge changes from topic 'ipsec-hide-overloads'
* changes:
Hide Socket+DatagramSocket IpSecTransform methods
Consistenly Throw IOExceptions from IpSecManager
Erik Kline [Tue, 18 Apr 2017 08:55:13 +0000 (08:55 +0000)]
Merge "Flatten the transitions to tethering and hotspot." am:
af5f00ee5e
am:
22b9eb972e
Change-Id: Idadc3d15c58a9cc6ac28784e3d507b4d2a83755a
Erik Kline [Tue, 18 Apr 2017 08:50:09 +0000 (08:50 +0000)]
Merge "Flatten the transitions to tethering and hotspot."
am:
af5f00ee5e
Change-Id: I0dd0a95e29b645d018d4d4f44696c2339f5d1127