Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Refactor BluetoothHeadset APIs used by Settings"

Browse Source
This commit is contained in:
Treehugger Robot
2019-12-06 00:11:52 +00:00
committed by Gerrit Code Review
parent 4efe689e4c 5f457c0586
commit b3de542cf7
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/system-current.txt
View File

@@ -1319,6 +1319,7 @@ package android.bluetooth {
public final class BluetoothHeadset implements android.bluetooth.BluetoothProfile { public final class BluetoothHeadset implements android.bluetooth.BluetoothProfile {
method @RequiresPermission(android.Manifest.permission.BLUETOOTH_ADMIN) public boolean connect(android.bluetooth.BluetoothDevice); method @RequiresPermission(android.Manifest.permission.BLUETOOTH_ADMIN) public boolean connect(android.bluetooth.BluetoothDevice);
method @RequiresPermission(android.Manifest.permission.BLUETOOTH_ADMIN) public boolean disconnect(android.bluetooth.BluetoothDevice); method @RequiresPermission(android.Manifest.permission.BLUETOOTH_ADMIN) public boolean disconnect(android.bluetooth.BluetoothDevice);
method @Nullable @RequiresPermission(android.Manifest.permission.BLUETOOTH) public android.bluetooth.BluetoothDevice getActiveDevice();
method @RequiresPermission(android.Manifest.permission.BLUETOOTH) public int getConnectionPolicy(@NonNull android.bluetooth.BluetoothDevice); method @RequiresPermission(android.Manifest.permission.BLUETOOTH) public int getConnectionPolicy(@NonNull android.bluetooth.BluetoothDevice);
method @RequiresPermission(android.Manifest.permission.BLUETOOTH_ADMIN) public boolean setConnectionPolicy(@NonNull android.bluetooth.BluetoothDevice, int); method @RequiresPermission(android.Manifest.permission.BLUETOOTH_ADMIN) public boolean setConnectionPolicy(@NonNull android.bluetooth.BluetoothDevice, int);
method @Deprecated @RequiresPermission(android.Manifest.permission.BLUETOOTH_ADMIN) public boolean setPriority(android.bluetooth.BluetoothDevice, int); method @Deprecated @RequiresPermission(android.Manifest.permission.BLUETOOTH_ADMIN) public boolean setPriority(android.bluetooth.BluetoothDevice, int);

5
core/java/android/bluetooth/BluetoothHeadset.java
View File

@@ -559,7 +559,7 @@ public final class BluetoothHeadset implements BluetoothProfile {
* *
* <p> The device should already be paired. * <p> The device should already be paired.
* Priority can be one of {@link BluetoothProfile#PRIORITY_ON} or * Priority can be one of {@link BluetoothProfile#PRIORITY_ON} or
* {@link BluetoothProfile#PRIORITY_OFF}, * {@link BluetoothProfile#PRIORITY_OFF}
* *
* @param device Paired bluetooth device * @param device Paired bluetooth device
* @param priority * @param priority
@@ -1133,8 +1133,9 @@ public final class BluetoothHeadset implements BluetoothProfile {
* is active. * is active.
* @hide * @hide
*/ */
@SystemApi
@Nullable
@RequiresPermission(android.Manifest.permission.BLUETOOTH) @RequiresPermission(android.Manifest.permission.BLUETOOTH)
@UnsupportedAppUsage
public BluetoothDevice getActiveDevice() { public BluetoothDevice getActiveDevice() {
if (VDBG) { if (VDBG) {
Log.d(TAG, "getActiveDevice"); Log.d(TAG, "getActiveDevice");

2
core/java/android/bluetooth/BluetoothHeadsetClient.java
View File

@@ -557,7 +557,7 @@ public final class BluetoothHeadsetClient implements BluetoothProfile {
* Set priority of the profile * Set priority of the profile
* *
* <p> The device should already be paired. * <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 device Paired bluetooth device
* @param priority * @param priority