Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b3de542c authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Refactor BluetoothHeadset APIs used by Settings"

parents 4efe689e 5f457c05

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -1319,6 +1319,7 @@ package android.bluetooth { 
  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 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_ADMIN) public boolean setConnectionPolicy(@NonNull android.bluetooth.BluetoothDevice, int);

    method @Deprecated @RequiresPermission(android.Manifest.permission.BLUETOOTH_ADMIN) public boolean setPriority(android.bluetooth.BluetoothDevice, int);

core/java/android/bluetooth/BluetoothHeadset.java

+3 −2
Original line number Diff line number Diff line
@@ -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");

core/java/android/bluetooth/BluetoothHeadsetClient.java

+1 −1
Original line number Diff line number Diff line
@@ -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