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

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

Merge "get and set audio route allowed APIs should have different IntDef since... 

Merge "get and set audio route allowed APIs should have different IntDef since they return different sets of values"
parents b9c27ff3 8b4df2fa

framework/java/android/bluetooth/BluetoothHeadset.java

+14 −3
Original line number Diff line number Diff line
@@ -951,10 +951,21 @@ public final class BluetoothHeadset implements BluetoothProfile { 
            BluetoothStatusCodes.ERROR_BLUETOOTH_NOT_ENABLED,

            BluetoothStatusCodes.ERROR_PROFILE_SERVICE_NOT_BOUND,

            BluetoothStatusCodes.ERROR_TIMEOUT,

            BluetoothStatusCodes.ERROR_UNKNOWN,

    })

    public @interface SetAudioRouteAllowedReturnValues {}



    /** @hide */

    @Retention(RetentionPolicy.SOURCE)

    @IntDef(value = {

            BluetoothStatusCodes.ALLOWED,

            BluetoothStatusCodes.NOT_ALLOWED,

            BluetoothStatusCodes.ERROR_BLUETOOTH_NOT_ENABLED,

            BluetoothStatusCodes.ERROR_PROFILE_SERVICE_NOT_BOUND,

            BluetoothStatusCodes.ERROR_TIMEOUT,

            BluetoothStatusCodes.ERROR_UNKNOWN,

    })

    public @interface AudioRouteAllowedReturnValues {}

    public @interface GetAudioRouteAllowedReturnValues {}



    /**

     * Sets whether audio routing is allowed. When set to {@code false}, the AG
@@ -975,7 +986,7 @@ public final class BluetoothHeadset implements BluetoothProfile { 
            android.Manifest.permission.BLUETOOTH_CONNECT,

            android.Manifest.permission.BLUETOOTH_PRIVILEGED,

    })

    public @AudioRouteAllowedReturnValues int setAudioRouteAllowed(boolean allowed) {

    public @SetAudioRouteAllowedReturnValues int setAudioRouteAllowed(boolean allowed) {

        if (VDBG) log("setAudioRouteAllowed");

        final IBluetoothHeadset service = mService;

        if (service == null) {
@@ -1014,7 +1025,7 @@ public final class BluetoothHeadset implements BluetoothProfile { 
            android.Manifest.permission.BLUETOOTH_CONNECT,

            android.Manifest.permission.BLUETOOTH_PRIVILEGED,

    })

    public @AudioRouteAllowedReturnValues int getAudioRouteAllowed() {

    public @GetAudioRouteAllowedReturnValues int getAudioRouteAllowed() {

        if (VDBG) log("getAudioRouteAllowed");

        final IBluetoothHeadset service = mService;

        if (service == null) {