Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6c7c8f50 authored by Johanna Ye's avatar Johanna Ye Committed by Automerger Merge Worker
Browse files

Merge "Allow existing HID pending connections to continue." am: dfa10871 am:... 

Merge "Allow existing HID pending connections to continue." am: dfa10871 am: 88f5ec90 am: 713615e5

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Bluetooth/+/1649371

Change-Id: I3ce8d7d10e85f846f907b08872ad5295c9caeb5f
parents 60ff68e7 713615e5

jni/com_android_bluetooth_hid_host.cpp

+1 −1
Original line number Diff line number Diff line
@@ -274,7 +274,7 @@ static jboolean connectHidNative(JNIEnv* env, jobject object, 


  jboolean ret = JNI_TRUE;

  bt_status_t status = sBluetoothHidInterface->connect((RawAddress*)addr);

  if (status != BT_STATUS_SUCCESS) {

  if (status != BT_STATUS_SUCCESS && status != BT_STATUS_BUSY) {

    ALOGE("Failed HID channel connection, status: %d", status);

    ret = JNI_FALSE;

  }