Commit Graph

97089 Commits

Author SHA1 Message Date
Automerger Merge Worker
fbacb0ed11 Merge "Implement INetworkMonitorCallbacks#notifyNetworkTestedWithExtras." am: 113ea83450
Change-Id: I39b74228c6c2a48ace7ad36dba995fa6f91bfbb5
2020-02-05 20:09:32 +00:00
Cody Kesting
113ea83450 Merge "Implement INetworkMonitorCallbacks#notifyNetworkTestedWithExtras." 2020-02-05 19:55:05 +00:00
Automerger Merge Worker
3f01e13713 Merge changes from topics "cbs_area_info", "subscription_id" am: 361cae3630
Change-Id: I95de805e4f8decbba7ab5f18278d97a13d064eb9
2020-02-05 19:19:33 +00:00
Automerger Merge Worker
8a6bd20bdb Renamed SUB_ID to SUBSCRIPTION_ID am: 087568092a
Change-Id: I3c5f995f742ea861140e22ab43ff40d89ab462ad
2020-02-05 19:19:27 +00:00
Jack Yu
361cae3630 Merge changes from topics "cbs_area_info", "subscription_id"
* changes:
  Added area info support in cell broadcast service
  Renamed SUB_ID to SUBSCRIPTION_ID
2020-02-05 19:13:54 +00:00
Cody Kesting
d198ed0a80 Implement INetworkMonitorCallbacks#notifyNetworkTestedWithExtras.
INetworkMonitorCallbacks defines notifyNetworkTestedWithExtras() for
notifying ConnectivityService of networks being tested along with a
PersistableBundle of extras. A new event is introduced for
NetworkStateTrackerHandler to notify the ConnectivityDiagnosticsHandler
before continuing with the normal processing for "network tested"
notifications. The event is also used in the
ConnectivityDiagnosticsHandler.

Bug: 143187964
Bug: 147391402
Test: compiles.
Test: atest CtsNetTestCases FrameworksNetTests
Change-Id: Iab29da790c0f5faae68227770bc3a84bbc94f124
Merged-In: Iab29da790c0f5faae68227770bc3a84bbc94f124
2020-02-05 18:48:12 +00:00
Automerger Merge Worker
630aacdc73 Merge "Remove System APIs not required for R" am: f5f137b9d3
Change-Id: I02925dc4f4810032a7381832187c420253227664
2020-02-05 12:04:38 +00:00
Automerger Merge Worker
5b9370b4c8 Merge "Add setSubscriptionPlans() and getSubscriptionPlans() @SystemApi" am: 12aeaefeaf
Change-Id: I8d9025a1419bdfff854eb44f92ab9afe009edddc
2020-02-05 12:04:08 +00:00
Neil Fuller
f5f137b9d3 Merge "Remove System APIs not required for R" 2020-02-05 11:56:20 +00:00
Aaron Huang
12aeaefeaf Merge "Add setSubscriptionPlans() and getSubscriptionPlans() @SystemApi" 2020-02-05 11:48:26 +00:00
Automerger Merge Worker
da086e20c0 Merge "Finalize @SystemApi annotation" am: 8de85f4b50
Change-Id: I33c752bd21ce66c95ef38530e3a28d48bb5d6946
2020-02-05 01:46:48 +00:00
Makoto Onuki
8de85f4b50 Merge "Finalize @SystemApi annotation" 2020-02-05 01:33:10 +00:00
Jack Yu
d588c33c71 Added area info support in cell broadcast service
Added a broadcast for area info changed event, and
also a get method in cell broadcast service to
retrieve the area info.

Test: Cell broadcast sanity tests
Bug: 141318859

Merged-In: I5995e3c5099a1e49cb0c54d33da1dbfcc94d4037
Change-Id: I5995e3c5099a1e49cb0c54d33da1dbfcc94d4037
(cherry picked from commit afaa71d418)
2020-02-04 17:03:01 -08:00
Automerger Merge Worker
cd3f28071e Merge "Change data type of duration param from int representing seconds to long representing milliseconds in BluetoothAdapter#setScanMode" am: 6d4004fc61
Change-Id: I3a222fe93c7cc4bfc0b967e51b633ceb0605c642
2020-02-05 00:50:59 +00:00
Rahul Sabnis
6d4004fc61 Merge "Change data type of duration param from int representing seconds to long representing milliseconds in BluetoothAdapter#setScanMode" 2020-02-05 00:41:33 +00:00
Jack Yu
087568092a Renamed SUB_ID to SUBSCRIPTION_ID
In order to be consistent with other existing APIs.

Test: Build
Bug: 146563563

Merged-In: Iac8d9abe3b011485ffe8220d94f25f99d022014b
Change-Id: Iac8d9abe3b011485ffe8220d94f25f99d022014b
(cherry picked from commit e94a7a4f97)
2020-02-04 16:20:44 -08:00
Automerger Merge Worker
7846b824e0 Merge "Add separate user consent for Platform VPNs" am: ede31cad1c
Change-Id: I38ceff087e37f6ede6819e706c36ee9129a1cc6b
2020-02-05 00:07:41 +00:00
Benedict Wong
ede31cad1c Merge "Add separate user consent for Platform VPNs" 2020-02-04 23:56:16 +00:00
Automerger Merge Worker
6461a7e81c Merge "Add public API for EuiccService log dump" am: f22d8eac6f
Change-Id: I1dc34f7a657a522826f0a8ed02ae726d9306150e
2020-02-04 22:30:23 +00:00
Rahul Sabnis
99507b5eb3 Change data type of duration param from int representing seconds to long
representing milliseconds in BluetoothAdapter#setScanMode

Bug: 144380530
Test: Manual
Change-Id: I76528478a64d22afefd4ec964d1a78295dd3c94f
2020-02-04 14:29:09 -08:00
Automerger Merge Worker
84642d37d5 Merge "Add getExtension to android.os.IBinder interface" am: 935dfd2ce9
Change-Id: I0379693d0c87e77eaed7dd133edb00c410d2dfd5
2020-02-04 22:28:29 +00:00
Alex Lin
f22d8eac6f Merge "Add public API for EuiccService log dump" 2020-02-04 22:26:53 +00:00
Yo Chiang
935dfd2ce9 Merge "Add getExtension to android.os.IBinder interface" 2020-02-04 22:17:24 +00:00
Automerger Merge Worker
e1f9b607d7 Merge "Added data coding scheme and location check time support" am: ad194f332d
Change-Id: I475683bca98d019295726a21a487253ae09383a7
2020-02-04 21:55:33 +00:00
Automerger Merge Worker
11e5071fbb Merge "Allow credstore to call into KeyAttestationApplicationIdProviderService" am: 715e754115
Change-Id: I0d0c1be195ec894570c1fcbebca3f8b3298b1b34
2020-02-04 21:49:42 +00:00
Makoto Onuki
e0d9a5a4f8 Finalize @SystemApi annotation
Bug: 148177503
Test: Build & tree hugger
Change-Id: I4f2394afcc25cdb2b03d58ebcc8d3fb1e4962e1e
2020-02-04 13:45:33 -08:00
Jack Yu
ad194f332d Merge "Added data coding scheme and location check time support" 2020-02-04 21:40:32 +00:00
Treehugger Robot
715e754115 Merge "Allow credstore to call into KeyAttestationApplicationIdProviderService" 2020-02-04 21:31:31 +00:00
Neil Fuller
4222b7bec8 Remove System APIs not required for R
Test: treehugger
Bug: 148842434
Merged-In: If022a726a058a90cb5446d220628c76800da8e96
Change-Id: If022a726a058a90cb5446d220628c76800da8e96
2020-02-04 21:21:34 +00:00
Benedict Wong
526e7dd0b6 Add separate user consent for Platform VPNs
This change adds a new VPN user consent flow (using the same text) for
granting the lesser OP_ACTIVATE_PLATFORM_VPN. A new
PlatformVpnConfirmDialog is created as a subclass to preserve all logic,
but ensure the right appop is granted for the relevant dialog.

Intent extras were considered, but are inherently unsafe, since the
caller may add any extras that they would want.

Bug: 144246835
Test: FrameworksNetTests passing
Change-Id: Ia6f36207d43c3748f938430c2780dcf29e5623f3
Merged-In: Ia6f36207d43c3748f938430c2780dcf29e5623f3
2020-02-04 21:05:36 +00:00
Jack Yu
eba90e264a Added data coding scheme and location check time support
AT&T requires showing data coding scheme, location check
time, whether shown to the user or not in the test menu.
Expanded database to support this.

Bug: 144152683
Test: Manully sending fake messages and verified database
Merged-In: Ib5b78802e7548da9f92492aae4c94ed3488b5e3d
Change-Id: Ib5b78802e7548da9f92492aae4c94ed3488b5e3d
(cherry picked from commit 641db9a36a)
2020-02-04 10:39:52 -08:00
David Zeuthen
117fcb6c33 Allow credstore to call into KeyAttestationApplicationIdProviderService
This was previously reserved for keystore only but since credstore
also needs to do attestations, this is needed.

Bug: 111446262
Test: atest android.security.identity.cts
Test: Manually verifying the AttestationApplicationId from credstore
Change-Id: Ie44f9e4c8f2e1bd916ccbe7c7e5537dc498d8154
2020-02-04 10:18:33 -05:00
Automerger Merge Worker
5846bfad68 Merge "More API council tidy up" am: f4e1ac840c
Change-Id: I3a14ce6e52bf6ac254c996c9739eac9fccbd6af6
2020-02-04 11:44:53 +00:00
Neil Fuller
f4e1ac840c Merge "More API council tidy up" 2020-02-04 11:35:11 +00:00
Automerger Merge Worker
ce4e22638c Merge "Add setSubscriptionOverride() to system API" am: f734372173
Change-Id: I80a7cae65eaefad94afa428c27c84338142bd224
2020-02-04 07:19:54 +00:00
Chalard Jean
f734372173 Merge "Add setSubscriptionOverride() to system API" 2020-02-04 07:07:57 +00:00
Automerger Merge Worker
d7ab8fec8c Merge changes I446a8595,I68d2293f am: 29044acc20
Change-Id: I8422163249ca637ab71b71777feded76e3225c2e
2020-02-03 22:34:25 +00:00
Automerger Merge Worker
a2cf5100f0 Merge "Do not use @SystemApi(client = MODULE_APPS) (documents/settings)" am: 9bf0c496df
Change-Id: Iadcd9db4717f1350621ce1565c1f79b75af5eced
2020-02-03 22:32:03 +00:00
Benedict Wong
29044acc20 Merge changes I446a8595,I68d2293f
* changes:
  Add VpnManager calls to ConnectivityService
  Add basic logic for profile-based VPNs
2020-02-03 22:31:37 +00:00
Anton Hansson
9bf0c496df Merge "Do not use @SystemApi(client = MODULE_APPS) (documents/settings)" 2020-02-03 22:29:37 +00:00
Makoto Onuki
4056d87005 Do not use @SystemApi(client = MODULE_APPS) (documents/settings)
There will be no special protection mechanisms around MODULE_APPS,
so we're going to remove it for now.

All the MODULE_APPS should be protected with a permission, etc, so
the change should be safe.

Bug: 148177503
Test: Build / treehugger
Change-Id: I76328c2d5aaa3f171bf8afde5b3d1accad8c2e2b
Merged-In: I76328c2d5aaa3f171bf8afde5b3d1accad8c2e2b
2020-02-03 20:37:22 +00:00
Automerger Merge Worker
72dcf0a781 Merge changes Ib7daba9c,Ib692bff0 am: 75b7e58c47
Change-Id: I3067f3dfa8a5d0167f27af5af768d303bccd5510
2020-02-03 20:08:24 +00:00
Treehugger Robot
75b7e58c47 Merge changes Ib7daba9c,Ib692bff0
* changes:
  UpdateEngine: add WorkerThread annotation.
  UpdateEngine.AllocateSpaceResult: rename functions
2020-02-03 19:55:48 +00:00
Automerger Merge Worker
8586776fbf Merge "API docs tidy up" am: 6aef6673df
Change-Id: I0be18d5713fa9ad17a53cfbf2ba445a181bc4a0c
2020-02-03 18:00:44 +00:00
Neil Fuller
6aef6673df Merge "API docs tidy up" 2020-02-03 17:48:03 +00:00
Automerger Merge Worker
704eab60eb Merge "Update javadocs for ConnectivityDiagnosticsManager." am: 4997b874a3
Change-Id: Ia393d1ee102ae7dfc4a7b5698b5f3b4882605e7c
2020-02-03 15:07:20 +00:00
Automerger Merge Worker
52309b9871 Merge "Add callback registration in ConnectivityService." am: e534c45250
Change-Id: Idf067ebd9299ca036965b7c7f82c13a6f659a821
2020-02-03 15:06:50 +00:00
Cody Kesting
4997b874a3 Merge "Update javadocs for ConnectivityDiagnosticsManager." 2020-02-03 14:56:13 +00:00
Cody Kesting
e534c45250 Merge "Add callback registration in ConnectivityService." 2020-02-03 14:55:54 +00:00
Automerger Merge Worker
a8116d930c Merge "Minor refactor of ChangeReporter and PlatformCompat" am: 55d16fac97
Change-Id: I691696fa0ffa50c87bb3afb26173f4cc595453a2
2020-02-03 12:46:12 +00:00