diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-12-08 05:14:33 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-12-08 05:14:33 -0800 |
| commit | 42db863c7055834c96a7c02a4389d55a7cb4968e (patch) | |
| tree | 64229ba844aa7011e3875dc48e9f60a4a0225360 | |
| parent | 2a0f8951eaa68aad3b0b16c896414c1a73fbad13 (diff) | |
| parent | 0c19a8f97ddec608f7d95edbf28159c3419dd02c (diff) | |
| download | android_packages_apps_Bluetooth-42db863c7055834c96a7c02a4389d55a7cb4968e.tar.gz android_packages_apps_Bluetooth-42db863c7055834c96a7c02a4389d55a7cb4968e.tar.bz2 android_packages_apps_Bluetooth-42db863c7055834c96a7c02a4389d55a7cb4968e.zip | |
Merge "Promotion of bt.lnx.2.1.c1-00012."
| -rw-r--r-- | jni/com_android_bluetooth_btservice_AdapterService.cpp | 5 |
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"); |