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

Commit 1143bc4f authored by Jack He's avatar Jack He Committed by android-build-merger
Browse files

Merge "HFP: Check if name is nullptr before calling GetStringUTFChars" am: ae9fab1b 

am: 7f2ff2e5

Change-Id: Iccbe503ac13cbbe451fe840c29562e8cef47d30e
parents 47ce0ad0 7f2ff2e5

android/app/jni/com_android_bluetooth_hfp.cpp

+7 −2
Original line number Diff line number Diff line
@@ -819,7 +819,10 @@ static jboolean phoneStateChangeNative(JNIEnv* env, jobject object, 
    return JNI_FALSE;

  }

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

  const char* name = env->GetStringUTFChars(name_str, nullptr);

  const char* name = nullptr;

  if (name_str != nullptr) {

    name = env->GetStringUTFChars(name_str, nullptr);

  }

  bt_status_t status = sBluetoothHfpInterface->PhoneStateChange(

      num_active, num_held, (bluetooth::headset::bthf_call_state_t)call_state,

      number, (bluetooth::headset::bthf_call_addrtype_t)type, name,
@@ -828,7 +831,9 @@ static jboolean phoneStateChangeNative(JNIEnv* env, jobject object, 
    ALOGE("Failed report phone state change, status: %d", status);

  }

  env->ReleaseStringUTFChars(number_str, number);

  if (name != nullptr) {

    env->ReleaseStringUTFChars(name_str, name);

  }

  env->ReleaseByteArrayElements(address, addr, 0);

  return (status == BT_STATUS_SUCCESS) ? JNI_TRUE : JNI_FALSE;

}