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

Commit 99792117 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6727633 from edc37264b3faab0397617e5732d8619ade05ee0e to sc-release 

Change-Id: I03cd3013fb5b0089666d2d8ad70b6d5b927b6f87
parents 9353237d cbf59849

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

+5 −0
Original line number Diff line number Diff line
@@ -96,6 +96,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";
@@ -306,6 +308,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