diff options
| author | William Escande <wescande@google.com> | 2022-03-16 16:12:29 +0100 |
|---|---|---|
| committer | William Escande <wescande@google.com> | 2022-03-19 10:51:06 +0000 |
| commit | 0d12e935fbbac725622bb50ff2282c903c9f8aa1 (patch) | |
| tree | f02b3cb5365a9730729998e971279857b19f181d /framework/java/android/bluetooth/BluetoothAdapter.java | |
| parent | cc894359938cb854ce9ae2b0d2af0bf4764974e6 (diff) | |
API Review: factoryReset->clearBluetooth
> Consider renaming the factoryReset method to “clearBluetooth”.
Bug: 222725037
Test: TH
Tag; #refactor
Change-Id: Idb86dc5b57b2482401f563daf71eef37610d3f0a
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 46d19217dd..e7ea35d07c 100644 --- a/framework/java/android/bluetooth/BluetoothAdapter.java +++ b/framework/java/android/bluetooth/BluetoothAdapter.java @@ -1405,7 +1405,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) { @@ -1427,6 +1427,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. * |