Merge "Bluetooth: persist state when turning on from BLE"

am: 8e9551bacf Change-Id: Iad69e2f184df54ffbb2d7169e45345c80547b010
2016-12-20 21:18:35 +00:00
parent 061d4fff4b 8e9551bacf
commit e6164ca72a
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
@@ -1222,8 +1222,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;
                            }
                        }