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

Commit 418a7601 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

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

Change-Id: I0e9300c86a6ec1f07d5b1a5c83f1b87a2c5ffaa5
parents 47e177d9 1dfa47ee

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;
@@ -1017,6 +1018,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;