From efdfea6d9936dd19fdaf9b301142c64515a5432b Mon Sep 17 00:00:00 2001
From: Mathew Inwood <mathewi@google.com>
Date: Wed, 4 Nov 2020 09:42:27 +0000
Subject: [PATCH] De-restrict BluetoothCodecStatus hidden APIs.

They were erroneously included in b/170729553 but should not have been.

Tag: #feature
Test: Manual
Change-Id: Ia3bd3b55de19a89d41a025dc0e03dec850c1ab07
---
 core/java/android/bluetooth/BluetoothCodecStatus.java | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/core/java/android/bluetooth/BluetoothCodecStatus.java b/core/java/android/bluetooth/BluetoothCodecStatus.java
index 3a65aaa0d16c9..7764ebeb2e332 100644
--- a/core/java/android/bluetooth/BluetoothCodecStatus.java
+++ b/core/java/android/bluetooth/BluetoothCodecStatus.java
@@ -18,7 +18,6 @@ package android.bluetooth;
 
 import android.annotation.Nullable;
 import android.compat.annotation.UnsupportedAppUsage;
-import android.os.Build;
 import android.os.Parcel;
 import android.os.Parcelable;
 
@@ -40,7 +39,7 @@ public final class BluetoothCodecStatus implements Parcelable {
      * This extra represents the current codec status of the A2DP
      * profile.
      */
-    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
+    @UnsupportedAppUsage
     public static final String EXTRA_CODEC_STATUS =
             "android.bluetooth.extra.CODEC_STATUS";
 
@@ -199,7 +198,7 @@ public final class BluetoothCodecStatus implements Parcelable {
      *
      * @return the current codec configuration
      */
-    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
+    @UnsupportedAppUsage
     public @Nullable BluetoothCodecConfig getCodecConfig() {
         return mCodecConfig;
     }
@@ -209,7 +208,7 @@ public final class BluetoothCodecStatus implements Parcelable {
      *
      * @return an array with the codecs local capabilities
      */
-    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
+    @UnsupportedAppUsage
     public @Nullable BluetoothCodecConfig[] getCodecsLocalCapabilities() {
         return mCodecsLocalCapabilities;
     }
@@ -219,7 +218,7 @@ public final class BluetoothCodecStatus implements Parcelable {
      *
      * @return an array with the codecs selectable capabilities
      */
-    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
+    @UnsupportedAppUsage
     public @Nullable BluetoothCodecConfig[] getCodecsSelectableCapabilities() {
         return mCodecsSelectableCapabilities;
     }