summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2016-02-26 01:22:23 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2016-02-26 01:22:23 -0800
commit2e4995fd7c4e2eb921b160ee07df0bf1b1efa1ac (patch)
treea77ab74b272deac31e0fe49f419de43b9713c292
parent482ccd64f43ab5b361aedd6ea1871a83222303dc (diff)
parent9233de67832d93b5d85d4ecc4090a8e8fef0bfcb (diff)
downloadandroid_system_bt-2e4995fd7c4e2eb921b160ee07df0bf1b1efa1ac.tar.gz
android_system_bt-2e4995fd7c4e2eb921b160ee07df0bf1b1efa1ac.tar.bz2
android_system_bt-2e4995fd7c4e2eb921b160ee07df0bf1b1efa1ac.zip
Merge "Stops all BLE timers when BT turn off request is issued to BT stack"
-rw-r--r--btif/src/btif_core.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/btif/src/btif_core.c b/btif/src/btif_core.c
index 1fc263c08..107755873 100644
--- a/btif/src/btif_core.c
+++ b/btif/src/btif_core.c
@@ -647,6 +647,11 @@ bt_status_t btif_disable_bluetooth(void)
btif_pan_cleanup();
BTA_DisableBluetooth();
+#if (BLE_INCLUDED == TRUE)
+ BTA_VendorCleanup();
+ BTA_StopBleTimers();
+#endif
+
return BT_STATUS_SUCCESS;
}
@@ -674,11 +679,6 @@ void btif_disable_bluetooth_evt(void)
bte_main_enable_lpm(FALSE);
#endif
-#if (BLE_INCLUDED == TRUE)
- BTA_VendorCleanup();
- BTA_StopBleTimers();
-#endif
-
bte_main_disable();
/* callback to HAL */