diff options
| author | Rahul Sabnis <rahulsabnis@google.com> | 2022-01-27 06:19:21 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-01-27 06:19:21 +0000 |
| commit | c88ca655d31e61a44a8ec569d52d4369742345a1 (patch) | |
| tree | 4492c07e0b3304f45f3693abd747b5ab55bcccba /framework/java/android/bluetooth/BluetoothAdapter.java | |
| parent | fc799ac75597afe800b7f482115703d99b03ec42 (diff) | |
| parent | 811aa14b2cf2c10bb01dc3632963e6bd7f5e36ed (diff) | |
Merge "Moving over core/api/*txt files" am: 268d01fbd6 am: 232de1de64 am: 811aa14b2c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/1960689
Change-Id: I46d1c61a44fb88f1ee8c158139c73b85743c8a91
Diffstat (limited to 'framework/java/android/bluetooth/BluetoothAdapter.java')
| -rw-r--r-- | framework/java/android/bluetooth/BluetoothAdapter.java | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/framework/java/android/bluetooth/BluetoothAdapter.java b/framework/java/android/bluetooth/BluetoothAdapter.java index 46893fcc25..3432551b1e 100644 --- a/framework/java/android/bluetooth/BluetoothAdapter.java +++ b/framework/java/android/bluetooth/BluetoothAdapter.java @@ -123,7 +123,8 @@ public final class BluetoothAdapter { /** * Default MAC address reported to a client that does not have the - * android.permission.LOCAL_MAC_ADDRESS permission. + * {@link android.Manifest.permission#LOCAL_MAC_ADDRESS} permission. + * * * @hide */ @@ -1274,13 +1275,12 @@ public final class BluetoothAdapter { * <p>For example, "00:11:22:AA:BB:CC". * * @return Bluetooth hardware address as string + * + * Requires {@code android.Manifest.permission#LOCAL_MAC_ADDRESS} and + * {@link android.Manifest.permission#BLUETOOTH_CONNECT}. */ @RequiresLegacyBluetoothPermission @RequiresBluetoothConnectPermission - @RequiresPermission(allOf = { - android.Manifest.permission.BLUETOOTH_CONNECT, - android.Manifest.permission.LOCAL_MAC_ADDRESS, - }) public String getAddress() { try { return mManagerService.getAddress(mAttributionSource); @@ -3597,6 +3597,7 @@ public final class BluetoothAdapter { return Collections.unmodifiableSet(deviceSet); } + @SuppressLint("GenericException") protected void finalize() throws Throwable { try { removeServiceStateCallback(mManagerCallback); |