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

Commit c6d1e832 authored by Satish Kodishala's avatar Satish Kodishala Committed by Myles Watson
Browse files

Send empty string for redial 

Test: 1. Enable HFP Client.
2. Discover, pair and connect to remote device.
3. Once connected, redial from hf client.

Failure:
There is a crash since NULL is sent from application
to the stack for redial.

Rootcause:
Application sending NULL for redial to the stack.

Fix:
For redial, NULL is sent from application to stack.
Due to NULL checks in JNI, there was an exception
generated while calling stack API. Send empty string
instead of null.

Fixes: 35415608
Change-Id: I1ee4b8c5fa43e005da228df1bd260d99d96a8913
parent d657bbb3

android/app/jni/com_android_bluetooth_hfpclient.cpp

+7 −7
Original line number Diff line number Diff line
@@ -581,17 +581,18 @@ static jboolean dialNative(JNIEnv* env, jobject object, jbyteArray address, 
    return JNI_FALSE;

  }



  const char* number = NULL;

  if (number_str != NULL) {

    number = env->GetStringUTFChars(number_str, NULL);

  const char* number = nullptr;

  if (number_str != nullptr) {

    number = env->GetStringUTFChars(number_str, nullptr);

  }



  bt_status_t status =

      sBluetoothHfpClientInterface->dial((const RawAddress*)addr, number);

    sBluetoothHfpClientInterface->dial((const RawAddress*)addr,

                                       number == nullptr ? "" : number);



  if (status != BT_STATUS_SUCCESS) {

    ALOGE("Failed to dial, status: %d", status);

  }

  if (number != NULL) {

  if (number != nullptr) {

    env->ReleaseStringUTFChars(number_str, number);

  }

  env->ReleaseByteArrayElements(address, addr, 0);
@@ -752,7 +753,6 @@ static jboolean sendATCmdNative(JNIEnv* env, jobject object, jbyteArray address, 
    jniThrowIOException(env, EINVAL);

    return JNI_FALSE;

  }



  const char* arg = NULL;

  if (arg_str != NULL) {

    arg = env->GetStringUTFChars(arg_str, NULL);