summaryrefslogtreecommitdiff
path: root/framework/java
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-07-14 06:17:41 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-07-14 06:17:41 +0000
commit036178e695097ec30885d887cda7798e39d2590c (patch)
tree73ddea70285e014faa255144549746647ece377f /framework/java
parent9b46dea5cf7a042dbad04e599b7285e874c2d72c (diff)
parentef1c055b5d9ce5a3c3917d2935f9c7220755e717 (diff)
Merge cherrypicks of [19281218] into tm-release.
Change-Id: Ib5a91249d5ee76592687f7a755148602ed3ff869
Diffstat (limited to 'framework/java')
-rw-r--r--framework/java/android/bluetooth/BluetoothDevice.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/framework/java/android/bluetooth/BluetoothDevice.java b/framework/java/android/bluetooth/BluetoothDevice.java
index e7a6ea0e84..5c91c9480b 100644
--- a/framework/java/android/bluetooth/BluetoothDevice.java
+++ b/framework/java/android/bluetooth/BluetoothDevice.java
@@ -1477,8 +1477,7 @@ public final class BluetoothDevice implements Parcelable, Attributable {
* Returns the identity address of this BluetoothDevice.
* <p> For example, "00:11:22:AA:BB:CC".
*
- * @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
+ * @return Bluetooth identity address as a string
* @hide
*/
@SystemApi