Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 35030868 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Make certain BluetoothProfile constants being used by CarBluetoothTest... 

Merge "Make certain BluetoothProfile constants being used by CarBluetoothTest into @SystemApi" am: 80a2b522 am: f0a2e25c am: 9c741338

Change-Id: I047f9d64c8dfef979e8281aa8cd9f2a73017bbcb
parents 957fbd4d 9c741338

api/system-current.txt

+4 −0
Original line number Diff line number Diff line
@@ -1629,10 +1629,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















  }

































core/java/android/bluetooth/BluetoothProfile.java



+4
−2




























Original line number
Diff line number
Diff line








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































    /**