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

Commit 31bcaf44 authored by Rahul Sabnis's avatar Rahul Sabnis
Browse files

Revert "Complete hard removal of BluetoothHeadset#setPriority system API that" 

This reverts commit 7407887e.

Bug: 209335798
Test: Manual
Reason for revert: Failing signature test that will be updated by paulduffin@

Change-Id: I9de1b07f2d0f4d01d9e3b57a6ddf8a4232db29b6
parent 7407887e

core/api/system-removed.txt

+8 −0
Original line number Diff line number Diff line
@@ -60,6 +60,14 @@ package android.app.search { 


}



package android.bluetooth {



  public final class BluetoothHeadset implements android.bluetooth.BluetoothProfile {

    method @Deprecated @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.MODIFY_PHONE_STATE}) public boolean setPriority(android.bluetooth.BluetoothDevice, int);

  }



}



package android.content {



  public class Intent implements java.lang.Cloneable android.os.Parcelable {

core/java/android/bluetooth/BluetoothHeadset.java

+43 −0
Original line number Diff line number Diff line
@@ -600,6 +600,49 @@ public final class BluetoothHeadset implements BluetoothProfile { 
        return BluetoothProfile.STATE_DISCONNECTED;

    }



    /**

     * Set priority of the profile

     *

     * <p> The device should already be paired.

     * Priority can be one of {@link BluetoothProfile#PRIORITY_ON} or

     * {@link BluetoothProfile#PRIORITY_OFF}

     *

     * @param device Paired bluetooth device

     * @param priority

     * @return true if priority is set, false on error

     * @hide

     * @deprecated Replaced with {@link #setConnectionPolicy(BluetoothDevice, int)}

     * @removed

     */

    @Deprecated

    @SystemApi

    @RequiresLegacyBluetoothAdminPermission

    @RequiresBluetoothConnectPermission

    @RequiresPermission(allOf = {

            android.Manifest.permission.BLUETOOTH_CONNECT,

            android.Manifest.permission.MODIFY_PHONE_STATE,

    })

    public boolean setPriority(BluetoothDevice device, int priority) {

        if (DBG) log("setPriority(" + device + ", " + priority + ")");

        final IBluetoothHeadset service = mService;

        if (service != null && isEnabled() && isValidDevice(device)) {

            if (priority != BluetoothProfile.PRIORITY_OFF

                    && priority != BluetoothProfile.PRIORITY_ON) {

                return false;

            }

            try {

                return service.setPriority(

                        device, BluetoothAdapter.priorityToConnectionPolicy(priority),

                        mAttributionSource);

            } catch (RemoteException e) {

                Log.e(TAG, Log.getStackTraceString(new Throwable()));

                return false;

            }

        }

        if (service == null) Log.w(TAG, "Proxy not attached to service");

        return false;

    }



    /**

     * Set connection policy of the profile

     *