am c6af69b2: Merge "Add an extra for the Disconnect Headset State." into froyo

Merge commit 'c6af69b2684e1a95368f52e1f1614595f85c9c12' into froyo-plus-aosp

* commit 'c6af69b2684e1a95368f52e1f1614595f85c9c12':
  Add an extra for the Disconnect Headset State.
This commit is contained in:
Jaikumar Ganesh
2010-04-05 14:50:46 -07:00
committed by Android Git Automerger

View File

@@ -73,6 +73,17 @@ public final class BluetoothHeadset {
public static final String EXTRA_AUDIO_STATE =
"android.bluetooth.headset.extra.AUDIO_STATE";
/** Extra to be used with the Headset State change intent.
* This will be used only when Headset state changes to
* {@link #STATE_DISCONNECTED} from any previous state.
* This extra field is optional and will be used when
* we have deterministic information regarding whether
* the disconnect was initiated by the remote device or
* by the local adapter.
*/
public static final String EXTRA_DISCONNECT_INITIATOR =
"android.bluetooth.headset.extra.DISCONNECT_INITIATOR";
/**
* TODO(API release): Consider incorporating as new state in
* HEADSET_STATE_CHANGED
@@ -100,6 +111,11 @@ public final class BluetoothHeadset {
/** Connection canceled before completetion. */
public static final int RESULT_CANCELED = 2;
/** Values for {@link #EXTRA_DISCONNECT_INITIATOR} */
public static final int REMOTE_DISCONNECT = 0;
public static final int LOCAL_DISCONNECT = 1;
/** Default priority for headsets that for which we will accept
* inconing connections and auto-connect */
public static final int PRIORITY_AUTO_CONNECT = 1000;