Colin Cross
8a5ea28a08
Merge "Convert libinputservice to Android.bp" am: a070e55e34
...
am: 4ad5543b38
2017-04-20 18:20:43 +00:00
Colin Cross
4ad5543b38
Merge "Convert libinputservice to Android.bp"
...
am: a070e55e34
2017-04-20 18:12:45 +00:00
Treehugger Robot
a070e55e34
Merge "Convert libinputservice to Android.bp"
2017-04-20 17:59:45 +00:00
Wenting Xiong
00539a10a3
Merge "DO NOT MERGE. SystemUI: Display RAT icon when data is off" am: a0cef3c9c1 -s ours
...
am: 8bb42caffb
2017-04-20 16:57:31 +00:00
Wenting Xiong
8bb42caffb
Merge "DO NOT MERGE. SystemUI: Display RAT icon when data is off"
...
am: a0cef3c9c1
2017-04-20 16:51:41 +00:00
Treehugger Robot
a0cef3c9c1
Merge "DO NOT MERGE. SystemUI: Display RAT icon when data is off"
2017-04-20 16:39:38 +00:00
Erik Kline
7d321645a2
Merge "Switch to WifiManager.{start,stop}SoftAp()" am: 275edcb940
...
am: 11fdd1769b
2017-04-20 15:54:32 +00:00
Erik Kline
11fdd1769b
Merge "Switch to WifiManager.{start,stop}SoftAp()"
...
am: 275edcb940
2017-04-20 15:50:19 +00:00
Treehugger Robot
275edcb940
Merge "Switch to WifiManager.{start,stop}SoftAp()"
2017-04-20 15:37:31 +00:00
Wenting Xiong
8daf38a719
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
2017-04-20 15:32:27 +00:00
Erik Kline
3fa8908370
Merge "Add local-only hotspot info into tether state change broadcast" am: 4c7a999d79
...
am: 6af3dd0fc3
2017-04-20 13:00:52 +00:00
Erik Kline
6af3dd0fc3
Merge "Add local-only hotspot info into tether state change broadcast"
...
am: 4c7a999d79
2017-04-20 12:55:48 +00:00
Hugo Benichi
b51307e12e
Merge "ConnectivityManager: remove obsolete callback types" am: 458f75ef69
...
am: 23ee1621c7
2017-04-20 12:53:22 +00:00
Treehugger Robot
4c7a999d79
Merge "Add local-only hotspot info into tether state change broadcast"
2017-04-20 12:47:55 +00:00
Hugo Benichi
23ee1621c7
Merge "ConnectivityManager: remove obsolete callback types"
...
am: 458f75ef69
2017-04-20 12:47:44 +00:00
Hugo Benichi
458f75ef69
Merge "ConnectivityManager: remove obsolete callback types"
2017-04-20 12:38:29 +00:00
Erik Kline
8351faa900
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
2017-04-20 19:44:01 +09:00
Erik Kline
d9bfb83d96
Merge "Make tetherChangePermission to be secured for AppOps permission" am: fe86a197a1
...
am: 0d1f04384f
2017-04-20 04:47:16 +00:00
Hugo Benichi
7bbd03be36
Merge "ConnectivityManager: unify prety printing of callback types." am: 0a4dc6a5d2
...
am: 3a0e92fada
2017-04-20 04:40:34 +00:00
Erik Kline
0d1f04384f
Merge "Make tetherChangePermission to be secured for AppOps permission"
...
am: fe86a197a1
2017-04-20 04:38:16 +00:00
Hugo Benichi
3a0e92fada
Merge "ConnectivityManager: unify prety printing of callback types."
...
am: 0a4dc6a5d2
2017-04-20 04:35:22 +00:00
Erik Kline
fe86a197a1
Merge "Make tetherChangePermission to be secured for AppOps permission"
2017-04-20 04:28:53 +00:00
Hugo Benichi
0a4dc6a5d2
Merge "ConnectivityManager: unify prety printing of callback types."
2017-04-20 04:28:45 +00:00
Colin Cross
ece22cf115
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 3fc8f2df30
2017-04-20 03:18:38 +00:00
Hugo Benichi
dba33db572
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
2017-04-20 10:42:38 +09:00
Hugo Benichi
a038568676
ConnectivityManager: unify prety printing of callback types.
...
And also remove some small code duplication (checkNotNull).
Test: built, flashed, runtest frameworks-net
Change-Id: Id6c13bca9d12f70b88806032e0a4fa198efbedc6
2017-04-20 10:42:38 +09:00
Jakub Pawlowski
f3732e2fe2
Merge "Expose LE advertiser address for easier PTS tests (1/6)" am: f2e6988350
...
am: fc99848b96
2017-04-19 21:44:50 +00:00
Jakub Pawlowski
fc99848b96
Merge "Expose LE advertiser address for easier PTS tests (1/6)"
...
am: f2e6988350
2017-04-19 21:39:11 +00:00
Jakub Pawlowski
f2e6988350
Merge "Expose LE advertiser address for easier PTS tests (1/6)"
2017-04-19 21:33:46 +00:00
Jakub Pawlowski
4bc4a44100
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
2017-04-19 21:32:57 +00:00
Zheng Zhang
86c579678e
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
2017-04-19 18:31:30 +00:00
Zheng Zhang
74b8c15d2b
Merge "DO NOT MERGE ANYWHERE: Move content from verison 123 to 122, and skip verison 123." into cw-f-dev
...
am: 5b84ba3b15
2017-04-19 18:26:33 +00:00
TreeHugger Robot
5b84ba3b15
Merge "DO NOT MERGE ANYWHERE: Move content from verison 123 to 122, and skip verison 123." into cw-f-dev
2017-04-19 18:21:46 +00:00
Jeff Hao
98f62d8aa0
Merge "Handle shared libraries for split apks." am: 9487dff8ab
...
am: dae160f51b
2017-04-19 17:30:06 +00:00
Jeff Hao
dae160f51b
Merge "Handle shared libraries for split apks."
...
am: 9487dff8ab
2017-04-19 17:21:36 +00:00
Treehugger Robot
9487dff8ab
Merge "Handle shared libraries for split apks."
2017-04-19 17:13:13 +00:00
Zheng Zhang
d5f1a555f2
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
2017-04-19 17:04:49 +00:00
Jakub Pawlowski
8359e191ae
Merge "Read by UUID for PTS tests (1/5)" am: 7826c08e21
...
am: 0c9c0969cc
2017-04-19 16:13:50 +00:00
Jakub Pawlowski
0c9c0969cc
Merge "Read by UUID for PTS tests (1/5)"
...
am: 7826c08e21
2017-04-19 16:04:45 +00:00
Tetsutoki Shiozawa
335d2edee2
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
2017-04-19 16:50:33 +09:00
Treehugger Robot
7826c08e21
Merge "Read by UUID for PTS tests (1/5)"
2017-04-19 06:08:49 +00:00
Jeff Hao
7da652fd43
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
2017-04-18 17:08:34 -07:00
Jaewan Kim
fcb86793a6
Merge "Add callback for AVRCP 1.6 support" am: 58b5789cde
...
am: 16e5c08cbd
2017-04-18 23:40:54 +00:00
Jaewan Kim
16e5c08cbd
Merge "Add callback for AVRCP 1.6 support"
...
am: 58b5789cde
2017-04-18 23:37:26 +00:00
Treehugger Robot
58b5789cde
Merge "Add callback for AVRCP 1.6 support"
2017-04-18 23:25:26 +00:00
nharold
6eab2ee093
Merge changes from topic 'ipsec-hide-overloads' am: fe358c6adf
...
am: 8508bc52d2
2017-04-18 22:02:48 +00:00
Nathan Harold
7883c5d460
Consistenly Throw IOExceptions from IpSecManager am: 0bfb207532
...
am: 5db180bbb7
2017-04-18 22:01:32 +00:00
nharold
8508bc52d2
Merge changes from topic 'ipsec-hide-overloads'
...
am: fe358c6adf
2017-04-18 21:51:25 +00:00
Nathan Harold
5db180bbb7
Consistenly Throw IOExceptions from IpSecManager
...
am: 0bfb207532
2017-04-18 21:50:30 +00:00
Jakub Pawlowski
de74891d1c
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
2017-04-18 20:47:03 +00:00
