commit 8b4df2faec3908113d77e239c06b01ebea4dc6cf
author Md Shahriar Hossain Sajib <sajibonly@google.com> Fri Feb 18 13:56:27 2022 +0800
committer Md Shahriar Hossain Sajib <sajibonly@google.com> Fri Feb 18 13:56:27 2022 +0800
tree a0e00d2a9b41fe5249291d023604d74cb1a03f20
parent c88f41cebe15845b2724e3c092bf8b5a310f2cf0

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

framework/java/android/bluetooth/BluetoothHeadset.java

diff --git a/framework/java/android/bluetooth/BluetoothHeadset.java b/framework/java/android/bluetooth/BluetoothHeadset.java
index fcab7b7..d3437f7 100644
--- a/framework/java/android/bluetooth/BluetoothHeadset.java
+++ b/framework/java/android/bluetooth/BluetoothHeadset.java
@@ -950,10 +950,21 @@
             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 @@
             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 @@
             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) {