diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2022-02-23 08:00:31 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2022-02-23 08:00:31 +0000 |
| commit | fcc1bce477415de2a792ffa2a1c701ea962627af (patch) | |
| tree | ba8937054b0d49ba9d7be293c01cbe0dbccde372 /framework/java/android/bluetooth/BluetoothHeadset.java | |
| parent | b9c27ff317112cd23992ef9bca0e56100a634ae4 (diff) | |
| parent | 8b4df2faec3908113d77e239c06b01ebea4dc6cf (diff) | |
Merge "get and set audio route allowed APIs should have different IntDef since they return different sets of values"
Diffstat (limited to 'framework/java/android/bluetooth/BluetoothHeadset.java')
| -rw-r--r-- | framework/java/android/bluetooth/BluetoothHeadset.java | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/framework/java/android/bluetooth/BluetoothHeadset.java b/framework/java/android/bluetooth/BluetoothHeadset.java index c1103ac33a..9fd29de7a3 100644 --- a/framework/java/android/bluetooth/BluetoothHeadset.java +++ b/framework/java/android/bluetooth/BluetoothHeadset.java @@ -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) { |