summaryrefslogtreecommitdiff
path: root/framework/java/android/bluetooth/BluetoothDevice.java
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2022-03-09 19:22:57 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2022-03-09 19:22:57 +0000
commit7897cdc217ebbe59577cada816a231e4685cf770 (patch)
tree27b02b61d857ed8c059ee08fcba7b010d28882c9 /framework/java/android/bluetooth/BluetoothDevice.java
parentb8b43e09300aa7482375e27a98cf65c4a959f731 (diff)
parent4c28ea22dc8647f38961b5be8d195698d02186d6 (diff)
Merge "Fix after API_review" into tm-dev
Diffstat (limited to 'framework/java/android/bluetooth/BluetoothDevice.java')
-rw-r--r--framework/java/android/bluetooth/BluetoothDevice.java8
1 files changed, 6 insertions, 2 deletions
diff --git a/framework/java/android/bluetooth/BluetoothDevice.java b/framework/java/android/bluetooth/BluetoothDevice.java
index 71e15f0063..710a428aff 100644
--- a/framework/java/android/bluetooth/BluetoothDevice.java
+++ b/framework/java/android/bluetooth/BluetoothDevice.java
@@ -264,7 +264,8 @@ public final class BluetoothDevice implements Parcelable, Attributable {
* Used as an Integer extra field in {@link #ACTION_BATTERY_LEVEL_CHANGED}
* intent. It contains the most recently retrieved battery level information
* ranging from 0% to 100% for a remote device, {@link #BATTERY_LEVEL_UNKNOWN}
- * when the valid is unknown or there is an error
+ * when the valid is unknown or there is an error, {@link #BATTERY_LEVEL_BLUETOOTH_OFF} when the
+ * bluetooth is off
*
* @hide
*/
@@ -415,7 +416,10 @@ public final class BluetoothDevice implements Parcelable, Attributable {
/**
* Used as an int extra field in {@link #ACTION_PAIRING_REQUEST}
- * intents as the value of passkey.
+ * intents as the location of initiator. Possible value are:
+ * {@link #EXTRA_PAIRING_INITIATOR_FOREGROUND},
+ * {@link #EXTRA_PAIRING_INITIATOR_BACKGROUND},
+ *
* @hide
*/
@SystemApi