diff options
| author | Rahul Sabnis <rahulsabnis@google.com> | 2019-12-06 00:32:21 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-12-06 00:32:21 -0800 |
| commit | fb486c21d98d937edae336b9071c3f38fcda908b (patch) | |
| tree | db3ba27a442076abcb0228dbb6f75f9021b52b17 /core/java/android | |
| parent | 8c7bd337482ddc42af5b49e2eccc5b2f43425ccc (diff) | |
| parent | c0efc04ea7145a044772bf171adb21f03d250dda (diff) | |
Merge "Refactor BluetoothHeadset APIs used by Settings" am: b3de542cf7 am: 12558824e4
am: c0efc04ea7
Change-Id: I9c3f6d5eedcb1197908c8a2cf208215a458cd25d
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/bluetooth/BluetoothHeadset.java | 5 | ||||
| -rw-r--r-- | core/java/android/bluetooth/BluetoothHeadsetClient.java | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/core/java/android/bluetooth/BluetoothHeadset.java b/core/java/android/bluetooth/BluetoothHeadset.java index ea3831a869fc..0955b103a8e8 100644 --- a/core/java/android/bluetooth/BluetoothHeadset.java +++ b/core/java/android/bluetooth/BluetoothHeadset.java @@ -559,7 +559,7 @@ public final class BluetoothHeadset implements BluetoothProfile { * * <p> The device should already be paired. * Priority can be one of {@link BluetoothProfile#PRIORITY_ON} or - * {@link BluetoothProfile#PRIORITY_OFF}, + * {@link BluetoothProfile#PRIORITY_OFF} * * @param device Paired bluetooth device * @param priority @@ -1133,8 +1133,9 @@ public final class BluetoothHeadset implements BluetoothProfile { * is active. * @hide */ + @SystemApi + @Nullable @RequiresPermission(android.Manifest.permission.BLUETOOTH) - @UnsupportedAppUsage public BluetoothDevice getActiveDevice() { if (VDBG) { Log.d(TAG, "getActiveDevice"); diff --git a/core/java/android/bluetooth/BluetoothHeadsetClient.java b/core/java/android/bluetooth/BluetoothHeadsetClient.java index a8e1fd26ad44..7ee29ff1c50b 100644 --- a/core/java/android/bluetooth/BluetoothHeadsetClient.java +++ b/core/java/android/bluetooth/BluetoothHeadsetClient.java @@ -557,7 +557,7 @@ public final class BluetoothHeadsetClient implements BluetoothProfile { * Set priority of the profile * * <p> The device should already be paired. - * Priority can be one of {@link #PRIORITY_ON} or {@link #PRIORITY_OFF}, + * Priority can be one of {@link #PRIORITY_ON} or {@link #PRIORITY_OFF} * * @param device Paired bluetooth device * @param priority |