| commit | 68b4e8c87e16e8ed4c4b982aa3ba4b710e6338fa | [log] [tgz] |
|---|---|---|
| author | Lucas Dupin <dupin@google.com> | Fri Mar 18 21:39:53 2022 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Mar 18 21:39:53 2022 +0000 |
| tree | 18d6c5a42a7521abf82dfcea0321050a06667345 | |
| parent | 153258f52ca5d7ebcbacc742fe59a8b9cae82e21 [diff] | |
| parent | 4c8553ba963c3141c90826c47783b4c06c06b03e [diff] |
Merge "Fix NPE during dumpsys" into tm-dev
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp index 268036c..bd831ff 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");