diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-10-27 15:51:46 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-10-27 15:51:46 -0700 |
| commit | 64a04eb003d2af5bbc84db3062ee4d6a4194c513 (patch) | |
| tree | bc87a1a13d777fe167e211cc3e7f107285e10ef9 | |
| parent | 00d04f777a8fd7f6ac9a32d73a37083e0b114d4c (diff) | |
| parent | b1f046425bec1bdddf52b8bc0a8c137bea705c90 (diff) | |
| download | frameworks_base-64a04eb003d2af5bbc84db3062ee4d6a4194c513.zip frameworks_base-64a04eb003d2af5bbc84db3062ee4d6a4194c513.tar.gz frameworks_base-64a04eb003d2af5bbc84db3062ee4d6a4194c513.tar.bz2 | |
Merge "Bluetooth: Use correct previous state while moving to STATE_OFF"
| -rw-r--r-- | services/core/java/com/android/server/BluetoothManagerService.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/BluetoothManagerService.java b/services/core/java/com/android/server/BluetoothManagerService.java index c56bcc9..fd7b050 100644 --- a/services/core/java/com/android/server/BluetoothManagerService.java +++ b/services/core/java/com/android/server/BluetoothManagerService.java @@ -1732,6 +1732,10 @@ class BluetoothManagerService extends IBluetoothManager.Stub { // Show prevState of BLE_ON as OFF to standard users prevState = BluetoothAdapter.STATE_OFF; } + else if (prevState == BluetoothAdapter.STATE_BLE_TURNING_OFF) { + // show prevState to TURNING_OFF + prevState = BluetoothAdapter.STATE_TURNING_OFF; + } Intent intent = new Intent(BluetoothAdapter.ACTION_STATE_CHANGED); intent.putExtra(BluetoothAdapter.EXTRA_PREVIOUS_STATE, prevState); intent.putExtra(BluetoothAdapter.EXTRA_STATE, newState); |