commit 80a7a76b9e5115032cae8ca526c9a97e0413e993
author Derek Sollenberger <djsollen@google.com> Wed Apr 14 10:22:58 2021 -0400
committer Derek Sollenberger <djsollen@google.com> Wed Apr 14 10:26:06 2021 -0400
tree 561d0ba6456e2c702b62dcbd4a2e84ca968f5757
parent 0e4c8a4648f7c7e44ebd7ddd7c02302744334df6

Don't attempt to print protected context stats if it doesn't exist

Test: atest DeviceHealthChecks:com.android.devicehealthchecks.SystemCheck#system_tombstone
Bug: 185265245
Change-Id: I40af86c5c80ee4fa80fce2176ee1395595f4e762

libs/renderengine/skia/SkiaGLRenderEngine.cpp

diff --git a/libs/renderengine/skia/SkiaGLRenderEngine.cpp b/libs/renderengine/skia/SkiaGLRenderEngine.cpp
index e781584..37d98a3 100644
--- a/libs/renderengine/skia/SkiaGLRenderEngine.cpp
+++ b/libs/renderengine/skia/SkiaGLRenderEngine.cpp
@@ -1294,7 +1294,9 @@
         StringAppendF(&result, "\n");
 
         SkiaMemoryReporter gpuProtectedReporter(gpuResourceMap, true);
-        mProtectedGrContext->dumpMemoryStatistics(&gpuProtectedReporter);
+        if (mProtectedGrContext) {
+            mProtectedGrContext->dumpMemoryStatistics(&gpuProtectedReporter);
+        }
         StringAppendF(&result, "Skia's GPU Protected Caches: ");
         gpuProtectedReporter.logTotals(result);
         gpuProtectedReporter.logOutput(result);