Merge TP1A.220209.001

Change-Id: Id0e2895d3220831d2c617a243047e8229af8acc9

1 files changed, 2 insertions, 0 deletions

diff --git a/framework/java/android/bluetooth/BluetoothCodecConfig.java b/framework/java/android/bluetooth/BluetoothCodecConfig.java
index 4db5d33f0b..b6d7fdc11d 100644
--- a/framework/java/android/bluetooth/BluetoothCodecConfig.java
+++ b/framework/java/android/bluetooth/BluetoothCodecConfig.java
@@ -19,6 +19,7 @@ package android.bluetooth;
 import android.annotation.IntDef;
 import android.annotation.NonNull;
 import android.annotation.Nullable;
+import android.annotation.SystemApi;
 import android.compat.annotation.UnsupportedAppUsage;
 import android.os.Parcel;
 import android.os.Parcelable;
@@ -521,6 +522,7 @@ public final class BluetoothCodecConfig implements Parcelable {
      * @return {@code true} if the codec is mandatory, {@code false} otherwise
      * @hide
      */
+    @SystemApi
     public boolean isMandatoryCodec() {
         return mCodecType == SOURCE_CODEC_TYPE_SBC;
     }