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

1 files changed, 3 insertions, 3 deletions

diff --git a/libs/nativedisplay/AChoreographer.cpp b/libs/nativedisplay/AChoreographer.cpp
index ea51245ac6..e458b2ecfb 100644
--- a/libs/nativedisplay/AChoreographer.cpp
+++ b/libs/nativedisplay/AChoreographer.cpp
@@ -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;