Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Replaced Bluetooth SystemProperties.set by sysprop" am: 4d612ad87b am: a9e669070b

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1914690

Change-Id: Ia874b068a02f6cb324e306e761a1071c0f54c2dd
This commit is contained in:
Etienne Ruffieux
2021-12-15 20:19:29 +00:00
committed by Automerger Merge Worker
parent 5b213271a2 a9e669070b
commit c748403369
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/bluetooth/BluetoothAdapter.java
View File

@@ -56,7 +56,7 @@ import android.os.ParcelUuid;
import android.os.RemoteException; import android.os.RemoteException;
import android.os.ResultReceiver; import android.os.ResultReceiver;
import android.os.ServiceManager; import android.os.ServiceManager;
import android.os.SystemProperties; import android.sysprop.BluetoothProperties;
import android.util.Log; import android.util.Log;
import android.util.Pair; import android.util.Pair;
@@ -1337,7 +1337,7 @@ public final class BluetoothAdapter {
return true; return true;
} }
Log.e(TAG, "factoryReset(): Setting persist.bluetooth.factoryreset to retry later"); Log.e(TAG, "factoryReset(): Setting persist.bluetooth.factoryreset to retry later");
SystemProperties.set("persist.bluetooth.factoryreset", "true"); BluetoothProperties.factory_reset(true);
} catch (RemoteException e) { } catch (RemoteException e) {
Log.e(TAG, "", e); Log.e(TAG, "", e);
} finally { } finally {