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

am: 1dfa47e

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

Change-Id: I0e9300c86a6ec1f07d5b1a5c83f1b87a2c5ffaa5

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;