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

Commit 900f693c authored by William Escande's avatar William Escande Committed by Automerger Merge Worker
Browse files

Merge "API Review: Add ConnectionState Intdef" into tm-dev am: 42d8dadd 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/17221283

Change-Id: I631ff5fcb195cb31cd5ebf35279d05d76aee113d
parents 4585cee3 42d8dadd

framework/java/android/bluetooth/BluetoothAdapter.java

+14 −9
Original line number Diff line number Diff line
@@ -747,6 +747,16 @@ public final class BluetoothAdapter { 
    public static final int STATE_DISCONNECTING =

            3; //BluetoothProtoEnums.CONNECTION_STATE_DISCONNECTING;



    /** @hide */

    @Retention(RetentionPolicy.SOURCE)

    @IntDef(prefix = { "STATE_" }, value = {

        STATE_DISCONNECTED,

        STATE_CONNECTING,

        STATE_CONNECTED,

        STATE_DISCONNECTING,

    })

    public @interface ConnectionState {}



    /** @hide */

    public static final String BLUETOOTH_MANAGER_SERVICE = "bluetooth_manager";

    private final IBinder mToken;
@@ -2921,13 +2931,12 @@ public final class BluetoothAdapter { 
     * <p> Use this function along with {@link #ACTION_CONNECTION_STATE_CHANGED}

     * intent to get the connection state of the adapter.

     *

     * @return One of {@link #STATE_CONNECTED}, {@link #STATE_DISCONNECTED}, {@link

     * #STATE_CONNECTING} or {@link #STATE_DISCONNECTED}

     * @return the connection state

     * @hide

     */

    @SystemApi

    @RequiresNoPermission

    public int getConnectionState() {

    public @ConnectionState int getConnectionState() {

        if (getState() != STATE_ON) {

            return BluetoothAdapter.STATE_DISCONNECTED;

        }
@@ -2983,17 +2992,13 @@ public final class BluetoothAdapter { 
     * is connected to any remote device for a specific profile.

     * Profile can be one of {@link BluetoothProfile#HEADSET}, {@link BluetoothProfile#A2DP}.

     *

     * <p> Return value can be one of

     * {@link BluetoothProfile#STATE_DISCONNECTED},

     * {@link BluetoothProfile#STATE_CONNECTING},

     * {@link BluetoothProfile#STATE_CONNECTED},

     * {@link BluetoothProfile#STATE_DISCONNECTING}

     * <p> Return the profile connection state

     */

    @RequiresLegacyBluetoothPermission

    @RequiresBluetoothConnectPermission

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    @SuppressLint("AndroidFrameworkRequiresPermission")

    public int getProfileConnectionState(int profile) {

    public @ConnectionState int getProfileConnectionState(int profile) {

        if (getState() != STATE_ON) {

            return BluetoothProfile.STATE_DISCONNECTED;

        }