commit 80a2b522b11e4c6844a3413523c4bba39b9af80b
author Treehugger Robot <treehugger-gerrit@google.com> Wed Jan 22 00:52:31 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jan 22 00:52:31 2020 +0000
tree e9e63a9018d81c70d96ef9f51bd705c791e776b5
parent 042ec2c190eb610bed6fabfa7447bd65d0f4f349
parent a079dc798472a079253abfd834c2276a58b0f134

Merge "Make certain BluetoothProfile constants being used by CarBluetoothTest into @SystemApi"

api/system-current.txt

diff --git a/api/system-current.txt b/api/system-current.txt
index 01ad1d2..89a54d9 100755
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -1463,10 +1463,14 @@
   }
 
   public interface BluetoothProfile {
+    field public static final int A2DP_SINK = 11; // 0xb
+    field public static final int AVRCP_CONTROLLER = 12; // 0xc
     field public static final int CONNECTION_POLICY_ALLOWED = 100; // 0x64
     field public static final int CONNECTION_POLICY_FORBIDDEN = 0; // 0x0
     field public static final int CONNECTION_POLICY_UNKNOWN = -1; // 0xffffffff
+    field public static final int HEADSET_CLIENT = 16; // 0x10
     field public static final int PAN = 5; // 0x5
+    field public static final int PBAP_CLIENT = 17; // 0x11
     field @Deprecated public static final int PRIORITY_OFF = 0; // 0x0
     field @Deprecated public static final int PRIORITY_ON = 100; // 0x64
   }

core/java/android/bluetooth/BluetoothProfile.java

diff --git a/core/java/android/bluetooth/BluetoothProfile.java b/core/java/android/bluetooth/BluetoothProfile.java
index 638e6de..7538df8 100644
--- a/core/java/android/bluetooth/BluetoothProfile.java
+++ b/core/java/android/bluetooth/BluetoothProfile.java
@@ -146,7 +146,7 @@
      *
      * @hide
      */
-    @UnsupportedAppUsage
+    @SystemApi
     int A2DP_SINK = 11;
 
     /**
@@ -154,7 +154,7 @@
      *
      * @hide
      */
-    @UnsupportedAppUsage
+    @SystemApi
     int AVRCP_CONTROLLER = 12;
 
     /**
@@ -169,6 +169,7 @@
      *
      * @hide
      */
+    @SystemApi
     int HEADSET_CLIENT = 16;
 
     /**
@@ -176,6 +177,7 @@
      *
      * @hide
      */
+    @SystemApi
     int PBAP_CLIENT = 17;
 
     /**