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

Commit e03a6f81 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: 1dfa47ee am: 418a7601 

am: 84608424

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

Change-Id: I722cd671b931cd78a284c28f028036cf9e7d8dbc
parents 83227219 84608424

core/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;