Commit Graph

106499 Commits

Author SHA1 Message Date
Makoto Onuki
8de85f4b50 Merge "Finalize @SystemApi annotation" 2020-02-05 01:33:10 +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
Benedict Wong
ede31cad1c Merge "Add separate user consent for Platform VPNs" 2020-02-04 23:56:16 +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
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
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
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
Chalard Jean
0b32981970 Merge changes Icb062ffb,I66c4e8f5,I85247411,Id47c19b7,Ib713c4ae, ...
* changes:
  [NS A36] Add a test for lost trusted capability
  [NS A35] Send updated scores to factories at the end.
  [NS A34] Still more simplification
  [NS A33] Unify changing the default network
  [NS A32] More simplification
  [NS A31] Simplification
  [NS A30] Note linger out of the rematch loop
  [NS A29] Call LOST callbacks at the end of the rematch.
  [NS A28] Move setting the default network out of the rematch loop.
2020-02-04 13:14:27 +00:00
Neil Fuller
f4e1ac840c Merge "More API council tidy up" 2020-02-04 11:35:11 +00:00
Chalard Jean
9f0e8ddad5 [NS A28] Move setting the default network out of the rematch loop.
Bug: 113554781
Test: FrameworkNetTests NetworkStackTests
Change-Id: I02d85f17bf0ea37ae173f306f5a47d7551773c3a
2020-02-04 16:23:58 +09:00
Treehugger Robot
b20182a741 Merge "ims:rcs uce update Add call composer, standalone chatbot feature tags for UCE" 2020-02-04 07:08:51 +00:00
Chalard Jean
f734372173 Merge "Add setSubscriptionOverride() to system API" 2020-02-04 07:07:57 +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
Treehugger Robot
75b7e58c47 Merge changes Ib7daba9c,Ib692bff0
* changes:
  UpdateEngine: add WorkerThread annotation.
  UpdateEngine.AllocateSpaceResult: rename functions
2020-02-03 19:55:48 +00:00
Neil Fuller
6aef6673df Merge "API docs tidy up" 2020-02-03 17:48:03 +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
Treehugger Robot
55d16fac97 Merge "Minor refactor of ChangeReporter and PlatformCompat" 2020-02-03 12:37:48 +00:00
Neil Fuller
fb23c3ea2e API docs tidy up
Based on feedback from API council.

Bug: 148402959
Bug: 148402200
Test: treehugger only
Change-Id: I273ced8ec61dd72d8fd290b976ecfe1e613a1941
2020-02-03 12:17:27 +00:00
Neil Fuller
4e540a1c59 Merge "Rename phoneId to slotIndex" 2020-02-03 11:55:39 +00:00
Aaron Huang
79f52ea525 Add setSubscriptionOverride() to system API
Add new API setSubscriptionOverride() in NetworkPolicyManager
and rename constants OVERRIDE_* to SUBSCRIPTION_OVERRIDE_*.
Make them @SystemApi for mainline support.

Bug: 138306002
Test: atest FrameworksNetTests
      atest FrameworksTelephonyTests

Change-Id: I56c777aa66d6f455695f133f9889979c13cd1bc8
Merged-In: I56c777aa66d6f455695f133f9889979c13cd1bc8
2020-02-03 19:26:42 +08:00
Yo Chiang
b031685032 Add getExtension to android.os.IBinder interface
Provide a mechanism to extend and customize a binder interface without
having to modify the original (base) interface.
See the full motivation here: aosp/1099664

Bug: 147834064
Test: atest FrameworksCoreTests:BinderTest FrameworksCoreTests:BinderProxyTest
Change-Id: Idd3595b1302cf7ac0590d064e795ba0b75811af6
2020-02-03 16:07:35 +08:00
Treehugger Robot
7a028c7f5b Merge "Add privileged permission to SystemApi BluetoothDevice#setAlias" 2020-02-01 23:37:34 +00:00
Treehugger Robot
f0f3a0f48e Merge "Add new API BluetoothAdapter#removeActiveDevice to replace calls to BluetoothAdapter#setActiveDevice with a null device" 2020-02-01 23:27:10 +00:00
Treehugger Robot
ea711aba95 Merge "Revert value of BluetoothDevice.ACTION_ALIAS_CHANGED back to android.bluetooth.device.action.ALIAS_CHANGED from android.bluetooth.action.ALIAS_CHANGED" 2020-02-01 22:21:27 +00:00
Alex Lin
d0c492f00f Add public API for EuiccService log dump
Add public APi to EuiccService which allows the connected LPA to dump
out the logs when a bug report is triggered.
Bug: 62881779
Test: manually tested by extracting bug report to see if the logs are
present and atest EuiccServiceTest

Change-Id: I0869b95d12ab87a5e2a255015549191040d9daa7
Merged-In: I0869b95d12ab87a5e2a255015549191040d9daa7
2020-01-31 14:05:58 -08:00
Rahul Sabnis
e75a016d1b Revert value of BluetoothDevice.ACTION_ALIAS_CHANGED back to
android.bluetooth.device.action.ALIAS_CHANGED from
android.bluetooth.action.ALIAS_CHANGED

Bug: 146158681
Test: Manual
Change-Id: Ie247568ff3e5a750d74f22636aca69e3e74a55f5
2020-01-31 10:38:02 -08:00
Cody Kesting
aadf4834f1 Update javadocs for ConnectivityDiagnosticsManager.
ConnectivityDiagnosticsManager comments for
registerConnectivityDiagnosticsCallback and
unregisterConnectivityDiagnosticsCallback are updated to reflect several
changes.

For register calls, any app will be able to register callbacks, but only
permissioned applications will have their callbacks invoked (and only
for networks managed by the application). Additionally, only the
registering app (uid) will be able to unregister a callback once
registered.

Bug: 143187964
Test: docs change only. compiles.
Change-Id: Ie7ae86a1afccb22d6c84027dbac49d7b8e431e8c
2020-01-31 09:49:25 -08:00
Cody Kesting
63e4e00371 Add callback registration in ConnectivityService.
ConnectivityDiagnosticsManager will send callbacks to
ConnectivityService for registering and unregistering them with the
system. ConnectivityService needs to do the processing for persisting
(and deleting) these callbacks on the ConnectivityService Thread, so
messages are sent to the Connectivity Diagnostics  Handler, which runs
on the ConnectivityService Thread.

Bug: 146444622
Bug: 143187964
Bug: 147848028
Test: compiles
Test: atest FrameworksNetTests
Change-Id: Ia5c8f90a60c050504e8676de9564a7607a9b03bc
2020-01-31 09:42:05 -08:00
Neil Fuller
d8da3387c4 Rename phoneId to slotIndex
Rename phoneId to slotIndex. Some of the classes are being put in an API
surface and phoneId is an internal concept. slotIndex is its replacement
and should be identical.

Bug: 148403082
Test: treehugger build only
Change-Id: Iecbf347c9d13877f2e3f74b6daa22661bade257a
2020-01-31 17:06:33 +00:00
atrost
e0c0823569 Fix comments on ChangeId.
This allows them to be used in doc generation.

Test: m -j offline-sdk-docs
Bug: 144927670
Change-Id: I849975c8bf880433490b42d514f3c8089029b497
2020-01-31 14:50:43 +00:00
Andrei Onea
1220afbd75 Minor refactor of ChangeReporter and PlatformCompat
Move all StatsLog generated constants into ChangeReporter, to make
re-submitting http://ag/10194708 easier.

Bug: 145952197
Test: atest PlatformCompatTest ChangeReporterTest
Change-Id: Iccff9582099c58f070a6b6aeb1d2588b0fafa90a
2020-01-31 14:30:28 +00:00
Qingxi Li
497afcff0c Merge "Remove try-catch from LocationPermissionChecker" 2020-01-31 03:35:08 +00:00
Benedict Wong
dc63bcc135 Add VpnManager calls to ConnectivityService
This commit adds the relevant calls to ConnectivityService for the
VpnManager API to be functional

Bug: 144246837
Test: VpnManagerTest updated, FrameworksNetTests passing
Change-Id: I446a8595e3583a842a7f89c4f8d74526a85e311c
2020-01-30 18:55:07 -08:00
Benedict Wong
b4b925fc18 Add basic logic for profile-based VPNs
This change adds stubs for the Platform built-in VPNs, along with
implementing some basic permissions checks.

Bug: 144246837
Test: FrameworksNetTests passing, new tests added
Change-Id: I68d2293fc1468544f0d9f64d02ea7e1c80c8d18c
2020-01-30 18:41:12 -08:00
Shuo Qian
a3243e8e6e Merge "Add LISTEN_ALWAYS_REPORTED_SIGNAL_STRENGTH into Shell permission" 2020-01-31 01:44:48 +00:00
Qingxi Li
0b61b3d716 Remove try-catch from LocationPermissionChecker
Since LocationPermissionChecker#checkLocationPermission will be
used in ConnectivityService and the try-catch style will end up
in unwinding the stack. This CL remove the try-catch block from
this check function.

Bug: 148460709
Test: atest LocationPermissionCheckerTest
Change-Id: Ia97b3d8b1a96aca10fd87876969c290818e7e758
Merged-In: Ia97b3d8b1a96aca10fd87876969c290818e7e758
2020-01-31 01:06:17 +00:00
Rahul Sabnis
e6f17155da Add new API BluetoothAdapter#removeActiveDevice to replace calls to
BluetoothAdapter#setActiveDevice with a null device

Bug: 147428526
Test: Manual
Change-Id: I838448a504515d5a8b1eec254ccc1d9414239475
2020-01-30 16:59:02 -08:00
Treehugger Robot
3c57a25b4f Merge "Add BLUETOOTH_PRIVILEGED permission to SystemApi BluetoothHidDevice#setConnectionPolicy" 2020-01-30 23:58:09 +00:00
David Su
23d84d343b Merge changes Iaa6f0d65,I68a16b64
* changes:
  Networking: Rename removeDoubleQuotes to sanitizeSsid
  Wifi: Rename removeDoubleQuotes to sanitizeSsid
2020-01-30 22:42:16 +00:00
sqian
dfdee636e3 Add LISTEN_ALWAYS_REPORTED_SIGNAL_STRENGTH into Shell permission
> Is the minimally scoped permission that needs to be added?
This is a minimal permission for always listening to signal strength.

> What options did you explore that did not need this permission?
CTS is required by API council; Telephony CTS is using shell to have
system permission. I don't see other options.

Integrate the callback of LISTEN_ALWAYS_REPORTED_SIGNAL_STRENGTH

Test: CTS; https://paste.googleplex.com/5811446241820672
Bug: 147322848
Change-Id: Id5afd261a7f00c25e3af3558f30fb92aad42f060
2020-01-30 14:14:43 -08:00
Rahul Sabnis
f93a469cec Add BLUETOOTH_PRIVILEGED permission to SystemApi
BluetoothHidDevice#setConnectionPolicy

Bug: 148597061
Test: Manual
Change-Id: I03875cb71483d3d6e18795324a7fbea6681fb9b0
2020-01-30 13:49:35 -08:00
Rahul Sabnis
98c6c7c4c9 Add privileged permission to SystemApi BluetoothDevice#setAlias
Bug: 144792904
Test: Manual
Change-Id: Ie11109736bb0eb4cd0f06c38db44805c0169ac5f
2020-01-30 12:02:17 -08:00