From a079dc798472a079253abfd834c2276a58b0f134 Mon Sep 17 00:00:00 2001
From: Rahul Sabnis <rahulsabnis@google.com>
Date: Tue, 21 Jan 2020 15:11:22 -0800
Subject: [PATCH] Make certain BluetoothProfile constants being used by
 CarBluetoothTest into @SystemApi

Bug: 146663105
Test: Manual
Change-Id: Ic474a85c17b69c71cf24b06d0262c13b3b8142fe
---
 api/system-current.txt                            | 4 ++++
 core/java/android/bluetooth/BluetoothProfile.java | 6 ++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/api/system-current.txt b/api/system-current.txt
index 98701fd5c599d..853ee9dd22b35 100755
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -1463,10 +1463,14 @@ package android.bluetooth {
   }
 
   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
   }
diff --git a/core/java/android/bluetooth/BluetoothProfile.java b/core/java/android/bluetooth/BluetoothProfile.java
index 638e6de06be74..7538df8bbe5f7 100644
--- a/core/java/android/bluetooth/BluetoothProfile.java
+++ b/core/java/android/bluetooth/BluetoothProfile.java
@@ -146,7 +146,7 @@ public interface BluetoothProfile {
      *
      * @hide
      */
-    @UnsupportedAppUsage
+    @SystemApi
     int A2DP_SINK = 11;
 
     /**
@@ -154,7 +154,7 @@ public interface BluetoothProfile {
      *
      * @hide
      */
-    @UnsupportedAppUsage
+    @SystemApi
     int AVRCP_CONTROLLER = 12;
 
     /**
@@ -169,6 +169,7 @@ public interface BluetoothProfile {
      *
      * @hide
      */
+    @SystemApi
     int HEADSET_CLIENT = 16;
 
     /**
@@ -176,6 +177,7 @@ public interface BluetoothProfile {
      *
      * @hide
      */
+    @SystemApi
     int PBAP_CLIENT = 17;
 
     /**