Merge "Allow factory reset when bluetooth is off (1/2)"

2016-04-01 23:46:33 +00:00
parent 01e307d461 db005bdce9
commit 1dfa47ee3e
1 changed files with 3 additions and 0 deletions
--- a/core/java/android/bluetooth/BluetoothAdapter.java
+++ b/core/java/android/bluetooth/BluetoothAdapter.java
@@ -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;