commit 3b7232c1abf51629975f90c85bad26b72290b3ec
author Chen Chen <cncn@google.com> Thu Jul 23 14:38:32 2020 -0700
committer Chen Chen <cncn@google.com> Fri Jul 24 18:14:11 2020 +0000
tree db6db6db43d29a307bfb6485b68d02f13b36617f
parent 212cf8a813c163b1587e6daf07c995b81d972c3b

BluetoothManagerService: enforce BLUETOOTH_PRIVILEGED for onFactoryReset

Bug: 159061926
Test: Try app_debug.apk in the bug,
and make sure Bluetooth won't be turned off by the app

Change-Id: I7d7e684be7908fc95f4f87528fb0ba7e5ace9f4a

services/core/java/com/android/server/BluetoothManagerService.java

diff --git a/services/core/java/com/android/server/BluetoothManagerService.java b/services/core/java/com/android/server/BluetoothManagerService.java
index 0d4efed..8c38b66 100644
--- a/services/core/java/com/android/server/BluetoothManagerService.java
+++ b/services/core/java/com/android/server/BluetoothManagerService.java
@@ -95,6 +95,8 @@
 
     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_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_ADDRESS = "bluetooth_address";
@@ -279,6 +281,9 @@
             };
 
     public boolean onFactoryReset() {
+        mContext.enforceCallingOrSelfPermission(BLUETOOTH_PRIVILEGED,
+                "Need BLUETOOTH_PRIVILEGED permission");
+
         // Wait for stable state if bluetooth is temporary state.
         int state = getState();
         if (state == BluetoothAdapter.STATE_BLE_TURNING_ON