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

Commit 25bbfda2 authored by Jaikumar Ganesh's avatar Jaikumar Ganesh Committed by Android Git Automerger
Browse files

am 485d577a: Merge "Fix BluetoothAdapter Connection change intent doc." into honeycomb 

* commit '485d577a':
  Fix BluetoothAdapter Connection change intent doc.
parents d48ba867 485d577a

core/java/android/bluetooth/BluetoothAdapter.java

+4 −4
Original line number Diff line number Diff line
@@ -296,12 +296,12 @@ public final class BluetoothAdapter { 
     * can use this intent.

     *

     * <p>This intent will have 3 extras:

     * {@link #EXTRA_STATE} - The current state.

     * {@link #EXTRA_PREVIOUS_STATE}- The previous.

     * {@link #EXTRA_CONNECTION_STATE} - The current connection state.

     * {@link #EXTRA_PREVIOUS_CONNECTION_STATE}- The previous connection state.

     * {@link BluetoothDevice#EXTRA_DEVICE} - The remote device.

     *

     * {@link #EXTRA_STATE} or {@link #EXTRA_PREVIOUS_STATE} can be any of

     * {@link #STATE_DISCONNECTED}, {@link #STATE_CONNECTING},

     * {@link #EXTRA_CONNECTION_STATE} or {@link #EXTRA_PREVIOUS_CONNECTION_STATE}

     * can be any of {@link #STATE_DISCONNECTED}, {@link #STATE_CONNECTING},

     * {@link #STATE_CONNECTED}, {@link #STATE_DISCONNECTING}.

     *

     * <p>Requires {@link android.Manifest.permission#BLUETOOTH} to receive.