commit 4c8553ba963c3141c90826c47783b4c06c06b03e
author Lucas Dupin <dupin@google.com> Tue Mar 15 20:49:50 2022 -0700
committer Lucas Dupin <dupin@google.com> Tue Mar 15 20:49:50 2022 -0700
tree df4006b589f9766425a3f600e7c9ae95882145b8
parent be204679335a0f2b513b9430e1c6ada0baceefa0

Fix NPE during dumpsys

When running dumpsys SurfaceFlinger during boot, it's possible that
mFlagManager is still null.

Bug: 203165976
Test: adb shell dumpsys SurfaceFlinger
Change-Id: Idff6d5e1267591813e960490539e1a5aaaea0163

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 425b78b..7164467 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -5436,7 +5436,9 @@
     /*
      * Dump flag/property manager state
      */
-    mFlagManager->dump(result);
+    if (mFlagManager != nullptr) {
+        mFlagManager->dump(result);
+    }
 
     result.append(mTimeStats->miniDump());
     result.append("\n");