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

Commit a630b2d6 authored by Greg Kaiser's avatar Greg Kaiser Committed by Android (Google) Code Review
Browse files

Merge "ContextHubService: Avoid null pointer dereference" into nyc-mr1-dev

parents e00fe598 ca9c6760

core/jni/android_hardware_location_ContextHubService.cpp

+2 −1
Original line number Diff line number Diff line
@@ -1157,7 +1157,8 @@ static jint nativeSendMessage(JNIEnv *env, jobject instance, jintArray header_, 
    if (retVal != 0) {

        ALOGD("Send Message failure - %d", retVal);

        if (msgType == CONTEXT_HUB_LOAD_APP) {

            closeLoadTxn(false, nullptr);

            jint ignored;

            closeLoadTxn(false, &ignored);

        } else if (msgType == CONTEXT_HUB_UNLOAD_APP) {

            closeUnloadTxn(false);

        }