summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2016-12-06 09:38:34 -0700
committerLinux Build Service Account <lnxbuild@localhost>2016-12-06 09:38:34 -0700
commit0c19a8f97ddec608f7d95edbf28159c3419dd02c (patch)
treeb41e966d9dab59f5279888adb8426ec968ddebbb
parent591e1c02f876ffb43a8cde6ac2b2f86a748fbd1a (diff)
parent8edd1a3a518f3858ba517de3bf010a5054de161f (diff)
downloadandroid_packages_apps_Bluetooth-0c19a8f97ddec608f7d95edbf28159c3419dd02c.tar.gz
android_packages_apps_Bluetooth-0c19a8f97ddec608f7d95edbf28159c3419dd02c.tar.bz2
android_packages_apps_Bluetooth-0c19a8f97ddec608f7d95edbf28159c3419dd02c.zip
Promotion of bt.lnx.2.1.c1-00012.
CRs Change ID Subject -------------------------------------------------------------------------------------------------------------- 1087262 I40b6de481a08e4c4cdeec6f2d1ac6eae1ff96530 Enable the native wake lock in BT stack Change-Id: I0c904bcd3a32c3fcf36568cd1adba7dfb18b847a CRs-Fixed: 1087262
-rw-r--r--jni/com_android_bluetooth_btservice_AdapterService.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/jni/com_android_bluetooth_btservice_AdapterService.cpp b/jni/com_android_bluetooth_btservice_AdapterService.cpp
index 30724f4bf..28a0e558c 100644
--- a/jni/com_android_bluetooth_btservice_AdapterService.cpp
+++ b/jni/com_android_bluetooth_btservice_AdapterService.cpp
@@ -754,6 +754,9 @@ static bool initNative(JNIEnv* env, jobject obj) {
sBluetoothInterface = NULL;
return JNI_FALSE;
}
+
+ /*disable these os_callout settings, so that native wake_lock will be enabled*/
+#if 0
ret = sBluetoothInterface->set_os_callouts(&sBluetoothOsCallouts);
if (ret != BT_STATUS_SUCCESS) {
ALOGE("Error while setting Bluetooth callouts: %d\n", ret);
@@ -761,7 +764,7 @@ static bool initNative(JNIEnv* env, jobject obj) {
sBluetoothInterface = NULL;
return JNI_FALSE;
}
-
+#endif
if ( (sBluetoothSocketInterface = (btsock_interface_t *)
sBluetoothInterface->get_profile_interface(BT_PROFILE_SOCKETS_ID)) == NULL) {
ALOGE("Error getting socket interface");