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

Commit 8ece26b8 authored by Xin Li's avatar Xin Li
Browse files

Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855 

Bug: 172690556
Merged-In: I78222391b83a4add8e964340ec08bb8a1306e1c6
Change-Id: I28bbf40820674675ccf765c912aa8140d3f74ab2
parents 049f0f5f 037f5817

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