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

Commit 5b2fed5f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "AChoreographer: Avoid potential NULL dereference" into rvc-dev am: 01ab4a27 

Change-Id: I847a216372476a7b9a2a05dcf6e60acf992bc417
parents 5eba7ae9 01ab4a27

libs/nativedisplay/AChoreographer.cpp

+3 −3
Original line number Diff line number Diff line
@@ -250,12 +250,12 @@ void Choreographer::registerRefreshRateCallback(AChoreographer_refreshRateCallba 
    }

    if (needsRegistration) {

        JNIEnv* env = getJniEnv();

        jobject dmg = env->CallStaticObjectMethod(gJni.displayManagerGlobal.clazz,

                                                  gJni.displayManagerGlobal.getInstance);

        if (env == nullptr) {

            ALOGW("JNI environment is unavailable, skipping registeration");

            ALOGW("JNI environment is unavailable, skipping registration");

            return;

        }

        jobject dmg = env->CallStaticObjectMethod(gJni.displayManagerGlobal.clazz,

                                                  gJni.displayManagerGlobal.getInstance);

        if (dmg == nullptr) {

            ALOGW("DMS is not initialized yet: skipping registration");

            return;