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

am: bf43955a6b Change-Id: I2d41410fcdb6824e45027412a7b80e16af797346
2016-12-20 21:35:03 +00:00
parent 2280ecf83a bf43955a6b
commit 891a513e01
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
@@ -1286,8 +1286,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;
                            }
                        }