Commit Graph

97119 Commits

Author SHA1 Message Date
Automerger Merge Worker
5d3e5fb3b5 Merge "Add TEST_MAPPING for gating and logging" am: 05fb4434f3
Change-Id: I701ef53dada696ee5f6e45d8539ca385a08ffc29
2020-02-10 21:24:31 +00:00
Treehugger Robot
05fb4434f3 Merge "Add TEST_MAPPING for gating and logging" 2020-02-10 21:12:10 +00:00
Andrei Onea
1a0195349b Add TEST_MAPPING for gating and logging
The tests included are unit tests for the implementation (under
FrameworksServicesTests), for the corresponding TestRule
(PlatformCompatGating) and CTS tests.

Bug: 137821288
Test: cd frameworks/base/core/java/android/app/compat && atest
Test: cd frameworks/base/services/core/java/com/android/server/compat \
          && atest
Change-Id: I1a652775715f1a9738cc72725303bc78dfa17d03
2020-02-10 18:25:06 +00:00
Automerger Merge Worker
00f11fe5fd Merge "Clear callingId before binder calls in CompatChanges" am: 45d1f67bf6
Change-Id: I803ed8ac7035295d819130d1b19c9585fe0edb65
2020-02-10 16:23:49 +00:00
Andrei-Valentin Onea
45d1f67bf6 Merge "Clear callingId before binder calls in CompatChanges" 2020-02-10 16:13:13 +00:00
Automerger Merge Worker
bd0f475895 Merge changes from topic "lights-manager" am: 59401aab80
Change-Id: I9a45024b3cb557afd4fb09e69692f35c4372c928
2020-02-08 01:37:15 +00:00
Treehugger Robot
71ab50ae23 Merge "DO NOT MERGE - Merge QQ1A.200205.002 into master" 2020-02-08 01:29:23 +00:00
Treehugger Robot
59401aab80 Merge changes from topic "lights-manager"
* changes:
  Add LightsManager implementation to LightsService
  Add Lights AIDL HAL support to LightsService
  Rename Light to LogicalLight to avoid namespace conflicts when adding AIDL HAL lights support.
2020-02-08 01:23:29 +00:00
Andrei Onea
01ba3215fa Clear callingId before binder calls in CompatChanges
Since this was already a recurring pattern when using PlatformCompat
directly, clear calling id before binder calls in CompatChanges.

Bug: 149091690
Test: atest CtsAppCompatHostTestCases
Change-Id: I4eec315eba14b840f9ef222b81b624d8e4f201eb
2020-02-07 19:19:20 +00:00
Automerger Merge Worker
09d92456fa Merge "Fix typo in ConnectivityDiagnosticsManager constant." am: d222986acd
Change-Id: Icaae03ca1895de4012deed1c1b81b16fad4ba439
2020-02-07 17:08:20 +00:00
Cody Kesting
d222986acd Merge "Fix typo in ConnectivityDiagnosticsManager constant." 2020-02-07 16:57:19 +00:00
Automerger Merge Worker
3ba215eefd Merge "NetworkPolicyManager: Add @SystemApi for mainlne module" am: c8b7cff7f4
Change-Id: Iba93c5f26010f647c78aef359e907d5f3b40fde0
2020-02-07 06:01:53 +00:00
Aaron Huang
c8b7cff7f4 Merge "NetworkPolicyManager: Add @SystemApi for mainlne module" 2020-02-07 05:47:45 +00:00
Ivailo Karamanolev
3e376b79ce Add LightsManager implementation to LightsService
Includes backend code to support LightsManager binder calls and route
them to the HALs.

Bug: 144979010
Bug: 144978691
Bug: 142715294
Change-Id: I0080972620ba7a3fb1197cdd0288287d3cfa8780
Fix: 142230898
Test: atest LightsManagerTest
Test: atest LightsServiceTest
Merged-In: I2db7f2caa432cd1e2389ea5ca6544200ada18675
2020-02-07 02:11:18 +01:00
Automerger Merge Worker
9f9657ee5e Merge "Add CompatChanges API." am: 54036c0525
Change-Id: Ieade8f2b33423bad4219ab2982b876b06e355e84
2020-02-06 17:43:00 +00:00
Andrei-Valentin Onea
54036c0525 Merge "Add CompatChanges API." 2020-02-06 17:31:15 +00:00
Automerger Merge Worker
02e64e352c Merge "More renames for API council" am: b03661f5d8
Change-Id: I1bd4db67106f8e885ca8449103af569ab100c361
2020-02-06 17:22:28 +00:00
Neil Fuller
b03661f5d8 Merge "More renames for API council" 2020-02-06 17:05:02 +00:00
atrost
8a3cd58882 Add CompatChanges API.
This wraps our existing APIs for isChangeEnabled, and is exposed for
mainline modules to use.
Also upgrading PlatformCompatChangeRule to androidx to match with
frameworks coretests.

Test: http://aosp/1203413
Test: atest android.app.compat.CompatChangesTest
Test: atest com.android.tests.gating.PlatformCompatGatingTest
Bug: 142650523
Change-Id: I12b9436c2ea955e9b74228f150b872d6eb3a1081
2020-02-06 14:42:31 +00:00
Automerger Merge Worker
fd9c242128 Merge "Avoid a @Nullable Boolean" am: 81a42af40d
Change-Id: I5cf10a143bba4351efa2ea22fc5ccddb732f3044
2020-02-06 08:52:00 +00:00
Neil Fuller
81a42af40d Merge "Avoid a @Nullable Boolean" 2020-02-06 08:43:56 +00:00
Neil Fuller
c0d59e39d7 More renames for API council
Renames PhoneTime[|Zone]Suggestion to TelephonyTime[|Zone]Suggestion.
Makes changes to generally avoid PHONE and use SLOT_INDEX or telephony
as appropriate for the usage. Removes telephony / phone from a few
variable names where it doesn't add value.

This commit also renames some remaining phoneId instances to slotIndex
which were missed when that rename happened.

Bug: 148842434
Test: treehugger
Change-Id: I4302e68082b802b75b53c02a9c9b1ae39dff6085
2020-02-06 08:41:26 +00:00
Automerger Merge Worker
1f65bc19d4 Merge "BluetoothAdapter#connectAllEnabledProfiles and BluetoothAdapter#disconnectAllEnabledProfiles updated to require BLUETOOTH_PRIVILEGED permission and update documentation to indicate connection and disconnection is asynchronous" am: 750ab04052
Change-Id: Ie1a3555e3ca5d6a137142d3693850d72184cd3b6
2020-02-06 04:46:01 +00:00
Rahul Sabnis
966cef37c2 BluetoothAdapter#connectAllEnabledProfiles and
BluetoothAdapter#disconnectAllEnabledProfiles updated to require
BLUETOOTH_PRIVILEGED permission and update documentation to indicate
connection and disconnection is asynchronous

Bug: 147321746
Test: Manual
Change-Id: I961f02a539a247b1397ce4f478b9dc804d9973ab
2020-02-05 16:37:18 -08:00
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
Xin Li
5b8d15365a DO NOT MERGE - Merge QQ1A.200205.002 into master
Bug: 147428392
Change-Id: I7939379e221123a74b387bf78ce90d68e0468ff0
2020-02-05 10:45:09 -08:00
Neil Fuller
b2d0306a00 Avoid a @Nullable Boolean
To avoid a @Nullable Boolean one method has been split into two. After
some changes in the last release this also removes an optional parameter
from the two new methods as it is now always null.

Bug: 148450671
Test: treehugger
Change-Id: I83be9647943c16ae30af4f8d032db428af1ad5fc
2020-02-05 17:13:31 +00:00
Cody Kesting
5c3e7d50cf Fix typo in ConnectivityDiagnosticsManager constant.
This change fixes a typo in the value assigned to the constant
KEY_NETWORK_PROBES_ATTEMPTED_BITMASK, which is defined in
ConnectivityDiagnosticsManager.ConnectivityReport.

Bug: 148939502
Test: compiles
Change-Id: I63863efa8c69593012bf4e95d896db192c6bfb5c
2020-02-05 08:56:48 -08: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