Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "BluetoothManagerService: enforce BLUETOOTH_PRIVILEGED for onFactoryReset" into rvc-qpr-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-07-31 21:38:40 +00:00
committed by Android (Google) Code Review
parent 63d4443fe9 3b7232c1ab
commit d53798ab4b
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/BluetoothManagerService.java
View File

@@ -95,6 +95,8 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
private static final String BLUETOOTH_ADMIN_PERM = android.Manifest.permission.BLUETOOTH_ADMIN; private static final String BLUETOOTH_ADMIN_PERM = android.Manifest.permission.BLUETOOTH_ADMIN;
private static final String BLUETOOTH_PERM = android.Manifest.permission.BLUETOOTH; private static final String BLUETOOTH_PERM = android.Manifest.permission.BLUETOOTH;
private static final String BLUETOOTH_PRIVILEGED =
android.Manifest.permission.BLUETOOTH_PRIVILEGED;
private static final String SECURE_SETTINGS_BLUETOOTH_ADDR_VALID = "bluetooth_addr_valid"; private static final String SECURE_SETTINGS_BLUETOOTH_ADDR_VALID = "bluetooth_addr_valid";
private static final String SECURE_SETTINGS_BLUETOOTH_ADDRESS = "bluetooth_address"; private static final String SECURE_SETTINGS_BLUETOOTH_ADDRESS = "bluetooth_address";
@@ -279,6 +281,9 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
}; };
public boolean onFactoryReset() { public boolean onFactoryReset() {
mContext.enforceCallingOrSelfPermission(BLUETOOTH_PRIVILEGED,
"Need BLUETOOTH_PRIVILEGED permission");
// Wait for stable state if bluetooth is temporary state. // Wait for stable state if bluetooth is temporary state.
int state = getState(); int state = getState();
if (state == BluetoothAdapter.STATE_BLE_TURNING_ON if (state == BluetoothAdapter.STATE_BLE_TURNING_ON