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

Commit 8b4df2fa authored by Md Shahriar Hossain Sajib's avatar Md Shahriar Hossain Sajib
Browse files

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

they return different sets of values

Bug: 219947178
Tag: #security
Test: atest BluetoothInstrumentationTest
Change-Id: Ife2d91e455fb31fef79744ce81398d20294b135a
parent c88f41ce

framework/java/android/bluetooth/BluetoothHeadset.java

+14 −3
Original line number Diff line number Diff line
@@ -950,10 +950,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
@@ -974,7 +985,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) {
@@ -1013,7 +1024,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) {