Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f5724a92 authored by Xin Li's avatar Xin Li
Browse files

DO NOT MERGE - Merge Android R QPR1 

Bug: 172690556
Merged-In: Ib81ba3288a986546bc570c3759c55d026add591a
Change-Id: I2acfeb6cfc83a80056a685355cc367a5514da069
parents ee7c90a5 77467521

service/java/com/android/server/bluetooth/BluetoothManagerService.java

+5 −0
Original line number Diff line number Diff line
@@ -97,6 +97,8 @@ class BluetoothManagerService extends IBluetoothManager.Stub { 


    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";
@@ -296,6 +298,9 @@ class BluetoothManagerService extends IBluetoothManager.Stub { 
    }



    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