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

Commit 7bd8017a authored by Chienyuan's avatar Chienyuan Committed by android-build-merger
Browse files

Merge "Declare STATE_AUDIO_CONNECTED in right place" am: 8fdfd917 

am: 2235a877

Change-Id: Ib76c1f59d811c76a4d44c9ca172599214631610e
parents 4c17543b 2235a877

core/java/android/bluetooth/BluetoothHeadset.java

+1 −2
Original line number Original line Diff line number Diff line
@@ -280,6 +280,7 @@ public final class BluetoothHeadset implements BluetoothProfile { 
     * {@link #EXTRA_STATE} or {@link #EXTRA_PREVIOUS_STATE} of

     * {@link #EXTRA_STATE} or {@link #EXTRA_PREVIOUS_STATE} of

     * {@link #ACTION_AUDIO_STATE_CHANGED} intent.

     * {@link #ACTION_AUDIO_STATE_CHANGED} intent.

     */

     */

    public static final int STATE_AUDIO_CONNECTED = 12;





    /**

    /**

     * Intent used to broadcast the headset's indicator status

     * Intent used to broadcast the headset's indicator status
@@ -322,8 +323,6 @@ public final class BluetoothHeadset implements BluetoothProfile { 
    public static final String EXTRA_HF_INDICATORS_IND_VALUE =

    public static final String EXTRA_HF_INDICATORS_IND_VALUE =

            "android.bluetooth.headset.extra.HF_INDICATORS_IND_VALUE";

            "android.bluetooth.headset.extra.HF_INDICATORS_IND_VALUE";





    public static final int STATE_AUDIO_CONNECTED = 12;



    private static final int MESSAGE_HEADSET_SERVICE_CONNECTED = 100;

    private static final int MESSAGE_HEADSET_SERVICE_CONNECTED = 100;

    private static final int MESSAGE_HEADSET_SERVICE_DISCONNECTED = 101;

    private static final int MESSAGE_HEADSET_SERVICE_DISCONNECTED = 101;