diff options
| author | Etienne Ruffieux <eruffieux@google.com> | 2022-02-10 00:12:40 +0000 |
|---|---|---|
| committer | Etienne Ruffieux <eruffieux@google.com> | 2022-02-10 00:13:46 +0000 |
| commit | b3ac949d1fa4ac5be2176d279280585463385065 (patch) | |
| tree | 0febf4515aff3b1b2b53954fcf61de7a99fd221b /service/java/com/android/server/bluetooth/BluetoothManagerService.java | |
| parent | 51ed4f0f0f8e529e8d647d986b6817954e7851de (diff) | |
fixing CTS tests for BluetoothAdapter restrictions
Tag: #feature
Test: atest
Bug: 218719641
Ignore-AOSP-First: change only in internal
Change-Id: I8e28eafcd6ba9dc67e205eec06ae07639a7e0a60
Diffstat (limited to 'service/java/com/android/server/bluetooth/BluetoothManagerService.java')
| -rw-r--r-- | service/java/com/android/server/bluetooth/BluetoothManagerService.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/service/java/com/android/server/bluetooth/BluetoothManagerService.java b/service/java/com/android/server/bluetooth/BluetoothManagerService.java index 5ad7f9d2f8..b153c04edf 100644 --- a/service/java/com/android/server/bluetooth/BluetoothManagerService.java +++ b/service/java/com/android/server/bluetooth/BluetoothManagerService.java @@ -1240,7 +1240,7 @@ class BluetoothManagerService extends IBluetoothManager.Stub { final int callingUid = Binder.getCallingUid(); final int callingPid = Binder.getCallingPid(); if (!isPrivileged(callingPid, callingUid) && !isDeviceOwner(callingUid, packageName) - && !CompatChanges.isChangeEnabled(RESTRICT_ENABLE_DISABLE, callingUid) + && CompatChanges.isChangeEnabled(RESTRICT_ENABLE_DISABLE, callingUid) && !isSystem(packageName, callingUid)) { return false; } @@ -3062,6 +3062,8 @@ class BluetoothManagerService extends IBluetoothManager.Stub { private boolean isPrivileged(int pid, int uid) { return (mContext.checkPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED, pid, uid) == PackageManager.PERMISSION_GRANTED) + || (mContext.checkPermission(android.Manifest.permission.NETWORK_SETTINGS, pid, uid) + == PackageManager.PERMISSION_GRANTED) || (mContext.getPackageManager().checkSignatures(uid, Process.SYSTEM_UID) == PackageManager.SIGNATURE_MATCH); } |