diff options
| author | William Escande <wescande@google.com> | 2022-03-21 17:44:58 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-03-21 17:44:58 +0000 |
| commit | 6f73014bbc606ee280f4f5514dec8c89ae833ee3 (patch) | |
| tree | 9fe89e29b2d1f0f443dcf6b53d9f864c601736c7 /framework/java/android/bluetooth/BluetoothAdapter.java | |
| parent | dcdc839adfa40a546d473aad1858c916e6824340 (diff) | |
| parent | 01a5b80bc351c06ffac9ad3a56ef59c4b39b565c (diff) | |
Merge "API Review: factoryReset->clearBluetooth" am: 85d45e8ee6 am: d10df2dcf7 am: 01a5b80bc3
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2028171
Change-Id: I15f7ac124b1d09fcd73c6b046b75c02de7db290c
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 84eddad0f9..8481601ba9 100644 --- a/framework/java/android/bluetooth/BluetoothAdapter.java +++ b/framework/java/android/bluetooth/BluetoothAdapter.java @@ -1518,7 +1518,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) { @@ -1540,6 +1540,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. * |