commit 2bcf821155351f2c421cb1caa2a94dc687925005
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Jan 10 18:07:17 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jan 10 18:07:17 2020 +0000
tree b7bb5c8722946eb29309e5d9fb2704ffcb698c29
parent 838817f1953feb7db7c927333b0abd3979daef41
parent 84d87ffc91d35d41d98d741258c40a367ba503fa

Merge "Check for null surface control before setting transform hint"

libs/gui/SurfaceComposerClient.cpp

diff --git a/libs/gui/SurfaceComposerClient.cpp b/libs/gui/SurfaceComposerClient.cpp
index f378fc5..9fba3d5 100644
--- a/libs/gui/SurfaceComposerClient.cpp
+++ b/libs/gui/SurfaceComposerClient.cpp
@@ -225,9 +225,11 @@
                                               .surfaceControls[surfaceStats.surfaceControl],
                                       surfaceStats.acquireTime, surfaceStats.previousReleaseFence,
                                       surfaceStats.transformHint);
-                callbacksMap[callbackId]
-                        .surfaceControls[surfaceStats.surfaceControl]
-                        ->setTransformHint(surfaceStats.transformHint);
+                if (callbacksMap[callbackId].surfaceControls[surfaceStats.surfaceControl]) {
+                    callbacksMap[callbackId]
+                            .surfaceControls[surfaceStats.surfaceControl]
+                            ->setTransformHint(surfaceStats.transformHint);
+                }
             }
 
             callbackFunction(transactionStats.latchTime, transactionStats.presentFence,