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

Commit c665683b authored by Satish Kodishala's avatar Satish Kodishala Committed by android-build-merger
Browse files

Merge "Send empty string for redial" am: 754d4799 

am: c9e7c10d

Change-Id: I49a460e5feeccf8e7498659a8129fd52c0c6d0f2
parents 08281180 c9e7c10d

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);