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

Commit 65ce6ae1 authored by Ajay Panicker's avatar Ajay Panicker Committed by android-build-merger
Browse files

Merge "Allow factory reset when bluetooth is off (1/2)" am: 47e24c97 

am: 418a760

* commit '418a7601b2f8397ed8bd6241bab5f6229a941aa1':
  Allow factory reset when bluetooth is off (1/2)

Change-Id: I3c84e37c3f200ffa4671c488cf1a65dc2e292490
parents 4e368938 47e24c97

framework/java/android/bluetooth/BluetoothAdapter.java

+3 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ import android.os.IBinder; 
import android.os.ParcelUuid;

import android.os.RemoteException;

import android.os.ServiceManager;

import android.os.SystemProperties;

import android.util.Log;

import android.util.Pair;
@@ -1015,6 +1016,8 @@ public final class BluetoothAdapter { 
        try {

            if (mService != null) {

                return mService.factoryReset();

            } else {

                SystemProperties.set("persist.bluetooth.factoryreset", "true");

            }

        } catch (RemoteException e) {Log.e(TAG, "", e);}

        return false;