commit e6164ca72a5ed4fe652b3c1af2624bf53898799f
author Andre Eisenbach <eisenbach@google.com> Tue Dec 20 21:18:35 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Dec 20 21:18:35 2016 +0000
tree 102aa26d19d4456770c3aa88f54028364b4a1b16
parent 061d4fff4bd59b9104b38f0eb8291aa8f7ca7487
parent 8e9551bacf4ef9ca135fcaa29b40d18969281236

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

Change-Id: Iad69e2f184df54ffbb2d7169e45345c80547b010

services/core/java/com/android/server/BluetoothManagerService.java

diff --git a/services/core/java/com/android/server/BluetoothManagerService.java b/services/core/java/com/android/server/BluetoothManagerService.java
index 5f0e0d0..a37fc8b 100644
--- a/services/core/java/com/android/server/BluetoothManagerService.java
+++ b/services/core/java/com/android/server/BluetoothManagerService.java
@@ -1222,8 +1222,9 @@
                         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;
                             }
                         }