1 files changed, 17 insertions, 9 deletions
diff --git a/framework/java/android/bluetooth/BluetoothClass.java b/framework/java/android/bluetooth/BluetoothClass.java
index 8535b4fd28..8a989a40d3 100755
--- a/framework/java/android/bluetooth/BluetoothClass.java
+++ b/framework/java/android/bluetooth/BluetoothClass.java
@@ -17,6 +17,7 @@
 package android.bluetooth;
 
 import android.annotation.Nullable;
+import android.annotation.SystemApi;
 import android.annotation.TestApi;
 import android.compat.annotation.UnsupportedAppUsage;
 import android.os.Build;
@@ -245,18 +246,22 @@ public final class BluetoothClass implements Parcelable {
         /**
          * @hide
          */
+        @SystemApi
         public static final int PERIPHERAL_NON_KEYBOARD_NON_POINTING = 0x0500;
         /**
          * @hide
          */
+        @SystemApi
         public static final int PERIPHERAL_KEYBOARD = 0x0540;
         /**
          * @hide
          */
+        @SystemApi
         public static final int PERIPHERAL_POINTING = 0x0580;
         /**
          * @hide
          */
+        @SystemApi
         public static final int PERIPHERAL_KEYBOARD_POINTING = 0x05C0;
     }
 
@@ -328,21 +333,26 @@ public final class BluetoothClass implements Parcelable {
         return Arrays.copyOfRange(bytes, 1, bytes.length);
     }
 
-    /** @hide */
-    @UnsupportedAppUsage
     public static final int PROFILE_HEADSET = 0;
-    /** @hide */
-    @UnsupportedAppUsage
+
     public static final int PROFILE_A2DP = 1;
+
     /** @hide */
+    @SystemApi
     public static final int PROFILE_OPP = 2;
-    /** @hide */
+
     public static final int PROFILE_HID = 3;
+
     /** @hide */
+    @SystemApi
     public static final int PROFILE_PANU = 4;
+
     /** @hide */
+    @SystemApi
     public static final int PROFILE_NAP = 5;
+
     /** @hide */
+    @SystemApi
     public static final int PROFILE_A2DP_SINK = 6;
 
     /**
@@ -351,11 +361,9 @@ public final class BluetoothClass implements Parcelable {
      * given class bits might support specified profile. It is not accurate for all
      * devices. It tries to err on the side of false positives.
      *
-     * @param profile The profile to be checked
-     * @return True if this device might support specified profile.
-     * @hide
+     * @param profile the profile to be checked
+     * @return whether this device supports specified profile
      */
-    @UnsupportedAppUsage
     public boolean doesClassMatch(int profile) {
         if (profile == PROFILE_A2DP) {
             if (hasService(Service.RENDER)) {