summaryrefslogtreecommitdiff
path: root/framework/java/android/bluetooth/BluetoothDevice.java
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-07-13 01:45:41 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-07-13 01:45:41 +0000
commit9b46dea5cf7a042dbad04e599b7285e874c2d72c (patch)
tree07fda1ed3d04ea1adce55e294c4f3a4f8610de48 /framework/java/android/bluetooth/BluetoothDevice.java
parent499408981d9ee670010347ebe61deecc0ff5a7a2 (diff)
parent44496dc25a9df80025c489cd9d6c1f6cced7e837 (diff)
Merge cherrypicks of [19221934] into tm-release.
Change-Id: Ifac34242b9765a5de9a6f3bc3665cf3d631a7bb0
Diffstat (limited to 'framework/java/android/bluetooth/BluetoothDevice.java')
-rw-r--r--framework/java/android/bluetooth/BluetoothDevice.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/framework/java/android/bluetooth/BluetoothDevice.java b/framework/java/android/bluetooth/BluetoothDevice.java
index 5c91c9480b..e7a6ea0e84 100644
--- a/framework/java/android/bluetooth/BluetoothDevice.java
+++ b/framework/java/android/bluetooth/BluetoothDevice.java
@@ -1477,7 +1477,8 @@ public final class BluetoothDevice implements Parcelable, Attributable {
* Returns the identity address of this BluetoothDevice.
* <p> For example, "00:11:22:AA:BB:CC".
*
- * @return Bluetooth identity address as a string
+ * @return this device's identity address as a string or {@code null} if the identity
+ * address is either not known or is unable to be retrieved
* @hide
*/
@SystemApi