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

Commit 12558824 authored by Rahul Sabnis's avatar Rahul Sabnis Committed by android-build-merger
Browse files

Merge "Refactor BluetoothHeadset APIs used by Settings" 

am: b3de542c

Change-Id: I239a1aa1ca4e8e374e99d7f4d4d25fb3bb6d1691
parents 86445ea5 b3de542c

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