Commit Graph

284571 Commits

Author SHA1 Message Date
Robin Lee
cd8557d15a Merge "Use Vpn rules (not firewall) for always-on VPN"
am: e4f56a7e44

Change-Id: I80b3607fd1c61875be8354439e09db56a0bd391d
2017-04-21 22:05:33 +00:00
Treehugger Robot
e4f56a7e44 Merge "Use Vpn rules (not firewall) for always-on VPN" 2017-04-21 21:53:15 +00:00
Jakub Pawlowski
e00b92e550 Merge "Bluetooth: improve getLeMaximumAdvertisingDataLength comment"
am: c8d5f84fcf

Change-Id: Ieec563c19e318e6ffc0716009d554a11ff9f4847
2017-04-21 20:38:00 +00:00
Jakub Pawlowski
c8d5f84fcf Merge "Bluetooth: improve getLeMaximumAdvertisingDataLength comment" 2017-04-21 20:28:45 +00:00
Jakub Pawlowski
4634b5cd27 Bluetooth: improve getLeMaximumAdvertisingDataLength comment
Bug: 37534792
Test: none
Change-Id: Ieff71356aceb0e2a4c6e81d9053f854448e0c927
2017-04-21 20:28:39 +00:00
Jordan Liu
9cad054e02 Merge "Use SubscriptionId instead of SubId"
am: 946410eef5

Change-Id: Ib6f689a69ff19b24cc5ac128e77254c0d7624161
2017-04-21 18:23:00 +00:00
Jordan Liu
946410eef5 Merge "Use SubscriptionId instead of SubId" 2017-04-21 18:17:53 +00:00
Meng Wang
03f4a0f034 Merge "Fix error message: getAllowedCarriers"
am: 112d039dfb

Change-Id: Ic04b23b87f56261c2c55f1e0a284109bf353c8d0
2017-04-21 16:32:12 +00:00
Treehugger Robot
112d039dfb Merge "Fix error message: getAllowedCarriers" 2017-04-21 16:23:34 +00:00
Erik Kline
f7c93bcd45 Merge "Clarify IControlsTethering LOCAL_ONLY state name"
am: 649c459858

Change-Id: Ia856b08ced4e26e32e107faac37e1c245caaf910
2017-04-21 09:07:46 +00:00
Erik Kline
649c459858 Merge "Clarify IControlsTethering LOCAL_ONLY state name" 2017-04-21 08:59:32 +00:00
Erik Kline
ca41be796a 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
2017-04-21 11:12:24 +09:00
Hugo Benichi
232198d02b Merge "Add BitUtils (from "Support multiple filters per association request")"
am: 1321e592fe

Change-Id: Ibe263aeb2868b75f0a7a75895c68a5aaf2ddfa38
2017-04-21 02:09:14 +00:00
Hugo Benichi
1321e592fe Merge "Add BitUtils (from "Support multiple filters per association request")" 2017-04-21 01:58:16 +00:00
Stanley Tng
16609dfe18 Merge "Allow the Bluetooth MAC address to be updated asynchronously (2/3)"
am: c5680c9b05

Change-Id: I63e35a957feb76517fb7559ecb6ac114109341ee
2017-04-21 01:25:00 +00:00
Treehugger Robot
c5680c9b05 Merge "Allow the Bluetooth MAC address to be updated asynchronously (2/3)" 2017-04-21 01:16:33 +00:00
Stanley Tng
ad4d1d8e28 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
2017-04-20 23:34:20 +00:00
Yang Ni
0962a6e83c Merge "Validates Intrinsic Blur only takes 2D Allocations"
am: b44f4d2f51

Change-Id: Ib2f8f8206fb77fad99c67d48b839231108e8d0cc
2017-04-20 22:47:34 +00:00
Yang Ni
b44f4d2f51 Merge "Validates Intrinsic Blur only takes 2D Allocations" 2017-04-20 22:37:21 +00:00
Colin Cross
4ad5543b38 Merge "Convert libinputservice to Android.bp"
am: a070e55e34

Change-Id: Iec35b80b29b3802f3cc4323eea5ece37bb445977
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
Jordan Liu
786b15c0e9 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
2017-04-20 10:43:23 -07:00
Wenting Xiong
8bb42caffb Merge "DO NOT MERGE. SystemUI: Display RAT icon when data is off"
am: a0cef3c9c1  -s ours

Change-Id: I5da0dee9e45352370b6b38c6995be080415d5588
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
11fdd1769b Merge "Switch to WifiManager.{start,stop}SoftAp()"
am: 275edcb940

Change-Id: I697bf530da9786da4ed1405ac8b44b7bc4d097a6
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
6af3dd0fc3 Merge "Add local-only hotspot info into tether state change broadcast"
am: 4c7a999d79

Change-Id: I911be691b15604a63aa02bf4db607ae1cd701cfe
2017-04-20 12:55:48 +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

Change-Id: I180b5ae5890172f14dd910ce3ef3d1c907e3475b
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
0d1f04384f Merge "Make tetherChangePermission to be secured for AppOps permission"
am: fe86a197a1

Change-Id: Iee0af54745c3341b2aeeee05690e0377cb807ad9
2017-04-20 04:38:16 +00:00
Hugo Benichi
3a0e92fada Merge "ConnectivityManager: unify prety printing of callback types."
am: 0a4dc6a5d2

Change-Id: Ifa2d9455b666c068b13973eb1dee2bfb97b7d446
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
Eugene Susla
8ab86a6dc6 Add BitUtils (from "Support multiple filters per association request")
This patch is a cherry-pick of the BitUtils class from commit
36e866b8e0.

(cherry picked from commit 36e866b8e0)

Test: none
Change-Id: Iaf33929f6841db273a92d650e84287bf2964fa3d
Merged-In: I0a978787551a1ee5750ec5544b241d3bbfed5a7c
2017-04-20 12:16:48 +09: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
fc99848b96 Merge "Expose LE advertiser address for easier PTS tests (1/6)"
am: f2e6988350

Change-Id: I5b494f00fb88381a7caf95aa206e2fcd373c7129
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
Meng Wang
c39e089e79 Fix error message: getAllowedCarriers
Test: make
Change-Id: I0ee74f34f31742f2bf979dd9158ed22d56d64e5e
2017-04-19 11:00:50 -07:00
Jeff Hao
dae160f51b Merge "Handle shared libraries for split apks."
am: 9487dff8ab

Change-Id: I3414ba72ba8e3c3fc2d169a2a892c851d2577f3b
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
Jakub Pawlowski
0c9c0969cc Merge "Read by UUID for PTS tests (1/5)"
am: 7826c08e21

Change-Id: I380a38460b1e00f405fdde0683c40dbc9c5b3807
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