diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-03-20 03:33:52 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-03-20 03:33:52 +0000 |
| commit | e6627c71725a5484e4eafa77a02fb99120e529df (patch) | |
| tree | beb38a06ad971dad5adc9ce74f2855899e974003 /core/java/android | |
| parent | 937136e5212be0d11ee12432ed07d5279d2adb55 (diff) | |
| parent | d61f3f9ce1df28e7d5be040550dfe95c57a4f0a0 (diff) | |
Merge "Fix bluetooth can't turn off during network reset (2/3)" into qt-qpr1-dev
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/bluetooth/BluetoothAdapter.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/core/java/android/bluetooth/BluetoothAdapter.java b/core/java/android/bluetooth/BluetoothAdapter.java index 31bbd16497cb..3b620b388eff 100644 --- a/core/java/android/bluetooth/BluetoothAdapter.java +++ b/core/java/android/bluetooth/BluetoothAdapter.java @@ -1195,9 +1195,11 @@ public final class BluetoothAdapter { public boolean factoryReset() { try { mServiceLock.readLock().lock(); - if (mService != null) { - return mService.factoryReset(); + if (mService != null && mService.factoryReset() + && mManagerService != null && mManagerService.onFactoryReset()) { + return true; } + Log.e(TAG, "factoryReset(): Setting persist.bluetooth.factoryreset to retry later"); SystemProperties.set("persist.bluetooth.factoryreset", "true"); } catch (RemoteException e) { Log.e(TAG, "", e); |