Merge "Bluetooth: persist state when turning on from BLE" am: 8e9551bacf am: e6164ca72a am: bf43955a6b

am: 891a513e01 Change-Id: I3e7b3fb0cc9c8cc9a6377cca9b9e3c54d192fd33
2016-12-20 21:40:06 +00:00
parent 917d048dde 891a513e01
commit f4344c21e0
1 changed files with 2 additions and 1 deletions
--- a/services/core/java/com/android/server/BluetoothManagerService.java
+++ b/services/core/java/com/android/server/BluetoothManagerService.java
@@ -1295,8 +1295,9 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
                        if (mBluetooth != null) {
                            int state = mBluetooth.getState();
                            if (state == BluetoothAdapter.STATE_BLE_ON) {
-                                Slog.w(TAG, "BT is in BLE_ON State");
+                                Slog.w(TAG, "BT Enable in BLE_ON State, going to ON");
                                mBluetooth.onLeServiceUp();
+                                persistBluetoothSetting(BLUETOOTH_ON_BLUETOOTH);
                                break;
                            }
                        }