diff options
| author | William Escande <wescande@google.com> | 2022-03-21 17:20:59 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-03-21 17:20:59 +0000 |
| commit | 01a5b80bc351c06ffac9ad3a56ef59c4b39b565c (patch) | |
| tree | 3a652ab64687949f3b0bca42ebd67f3ec95139fd /framework/java/android/bluetooth/BluetoothAdapter.java | |
| parent | b32ce43b8b7e35ba50a8d34e3e439ba5726dccc4 (diff) | |
| parent | d10df2dcf7c2f3ae8db559961f78839ad8fcb8f0 (diff) | |
Merge "API Review: factoryReset->clearBluetooth" am: 85d45e8ee6 am: d10df2dcf7
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2028171
Change-Id: Icc8872efa94ebbb55e3b672f8f1b9bc11aac57c0
Diffstat (limited to 'framework/java/android/bluetooth/BluetoothAdapter.java')
| -rw-r--r-- | framework/java/android/bluetooth/BluetoothAdapter.java | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/framework/java/android/bluetooth/BluetoothAdapter.java b/framework/java/android/bluetooth/BluetoothAdapter.java index 2b03261cd6..aedd85d156 100644 --- a/framework/java/android/bluetooth/BluetoothAdapter.java +++ b/framework/java/android/bluetooth/BluetoothAdapter.java @@ -1412,7 +1412,7 @@ public final class BluetoothAdapter { android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED, }) - public boolean factoryReset() { + public boolean clearBluetooth() { try { mServiceLock.readLock().lock(); if (mService != null) { @@ -1434,6 +1434,22 @@ public final class BluetoothAdapter { return false; } + /** + * See {@link #clearBluetooth()} + * + * @return true to indicate that the config file was successfully cleared + * @hide + */ + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @RequiresBluetoothConnectPermission + @RequiresPermission(allOf = { + android.Manifest.permission.BLUETOOTH_CONNECT, + android.Manifest.permission.BLUETOOTH_PRIVILEGED, + }) + public boolean factoryReset() { + return clearBluetooth(); + } + /** * Get the UUIDs supported by the local Bluetooth adapter. * |