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

Commit f2052acb authored by Syed Ibrahim M's avatar Syed Ibrahim M Committed by Matthew Xie
Browse files

Fix for BT crash during CPBR AT cmd processing 

Delete the local reference of jstring objects during every callback
for unknown AT command and dial command after JNI calls the Java
methods.
Bug 7044655

Change-Id: I21792b95fbad37c488ec5a1a30521a5413192751
parent 12528789

android/app/jni/com_android_bluetooth_hfp.cpp

+6 −2
Original line number Diff line number Diff line
@@ -118,9 +118,11 @@ static void volume_control_callback(bthf_volume_type_t type, int volume) { 


static void dial_call_callback(char *number) {

    CHECK_CALLBACK_ENV

    jstring js_number = sCallbackEnv->NewStringUTF(number);

    sCallbackEnv->CallVoidMethod(mCallbacksObj, method_onDialCall,

                                 sCallbackEnv->NewStringUTF(number));

                                 js_number);

    checkAndClearExceptionFromCallback(sCallbackEnv, __FUNCTION__);

    sCallbackEnv->DeleteLocalRef(js_number);

}



static void dtmf_cmd_callback(char dtmf) {
@@ -169,9 +171,11 @@ static void at_clcc_callback() { 


static void unknown_at_callback(char *at_string) {

    CHECK_CALLBACK_ENV

    jstring js_at_string = sCallbackEnv->NewStringUTF(at_string);

    sCallbackEnv->CallVoidMethod(mCallbacksObj, method_onUnknownAt,

                                 sCallbackEnv->NewStringUTF(at_string));

                                 js_at_string);

    checkAndClearExceptionFromCallback(sCallbackEnv, __FUNCTION__);

    sCallbackEnv->DeleteLocalRef(js_at_string);

}



static void key_pressed_callback() {