Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make certain BluetoothProfile constants being used by CarBluetoothTest into @SystemApi" am: 80a2b522b1 am: f0a2e25c9f

Browse Source 
Change-Id: Iabad8d9759050a44edfee36ce70af9b38cb09c8a
This commit is contained in:
Automerger Merge Worker
2020-01-22 01:17:51 +00:00
parent c7f104c424 f0a2e25c9f
commit 9c741338dc
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/system-current.txt
View File

@@ -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
}

6
core/java/android/bluetooth/BluetoothProfile.java
View File

@@ -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;
/**