commit a857e79e381fba182a11310022e4d0ca3fc9dc27
author TreeHugger Robot <treehugger-gerrit@google.com> Mon May 11 19:33:39 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon May 11 19:33:39 2020 +0000
tree bc886090b5690c30e8c4c89ef642c8007c69ded7
parent 958790f69705b0a06546b9971f95d42bdb7f844e
parent 01ab4a277fffec62fa72117d0b83d62b1888bf78

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

Change-Id: I3f4f1d4809d59394285f7c286a7f3f3014221161

libs/nativedisplay/AChoreographer.cpp

diff --git a/libs/nativedisplay/AChoreographer.cpp b/libs/nativedisplay/AChoreographer.cpp
index ea51245..e458b2e 100644
--- a/libs/nativedisplay/AChoreographer.cpp
+++ b/libs/nativedisplay/AChoreographer.cpp
@@ -250,12 +250,12 @@
     }
     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;