diff options
| author | Etan Cohen <etancohen@google.com> | 2015-04-24 13:44:05 -0700 |
|---|---|---|
| committer | Etan Cohen <etancohen@google.com> | 2015-04-24 13:44:05 -0700 |
| commit | b554bcde382e1deaaeab2900ba779e777ebfab86 (patch) | |
| tree | 58f443c20d90fedf02d7ec55b54c1e8c25c7c3e6 /framework/java/android/bluetooth/BluetoothAdapter.java | |
| parent | ea513c5d27bae3008d787bc42c6ad8ab6879b9e9 (diff) | |
| parent | 5e8cdc7f00265c4adb2b22935eb28708fdbf29ae (diff) | |
Merge commit '5e8cdc7' into merge2
Diffstat (limited to 'framework/java/android/bluetooth/BluetoothAdapter.java')
| -rw-r--r-- | framework/java/android/bluetooth/BluetoothAdapter.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/framework/java/android/bluetooth/BluetoothAdapter.java b/framework/java/android/bluetooth/BluetoothAdapter.java index 79e560ff9f..c124a18d23 100644 --- a/framework/java/android/bluetooth/BluetoothAdapter.java +++ b/framework/java/android/bluetooth/BluetoothAdapter.java @@ -121,6 +121,9 @@ public final class BluetoothAdapter { * {@link #STATE_TURNING_ON}, * {@link #STATE_ON}, * {@link #STATE_TURNING_OFF}, + * {@link #STATE_BLE_TURNING_ON}, + * {@link #STATE_BLE_ON}, + * {@link #STATE_BLE_TURNING_OFF}, */ public static final String EXTRA_STATE = "android.bluetooth.adapter.extra.STATE"; @@ -131,6 +134,9 @@ public final class BluetoothAdapter { * {@link #STATE_TURNING_ON}, * {@link #STATE_ON}, * {@link #STATE_TURNING_OFF}, + * {@link #STATE_BLE_TURNING_ON}, + * {@link #STATE_BLE_ON}, + * {@link #STATE_BLE_TURNING_OFF}, */ public static final String EXTRA_PREVIOUS_STATE = "android.bluetooth.adapter.extra.PREVIOUS_STATE"; |