summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Ajay Panicker <apanicke@google.com> 2016-02-29 16:09:14 -0800
committer Andre Eisenbach <eisenbach@google.com> 2016-04-05 20:23:21 +0000
commitb6e1dafe78b2875ebe1837508e28c8dce2693b19 (patch)
treef30617bbbfcd8cc2dd303582f0fd980a28e16add
parentd1427fbe0de9039e9ca94038ef070772e8afc4a3 (diff)
Allow factory reset when bluetooth is off (1/2)
Bug: 27348444 Change-Id: I6c2709371b86581709649d7faf09391230449b9b
-rw-r--r--core/java/android/bluetooth/BluetoothAdapter.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/core/java/android/bluetooth/BluetoothAdapter.java b/core/java/android/bluetooth/BluetoothAdapter.java
index d762a1727272..2a7eff883095 100644
--- 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;
@@ -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;