commit 84d87ffc91d35d41d98d741258c40a367ba503fa
author Valerie Hau <vhau@google.com> Wed Jan 08 17:23:21 2020 -0800
committer Valerie Hau <vhau@google.com> Wed Jan 08 17:25:44 2020 -0800
tree 1500167ffb07c0360753d4544ce5654e2562e98f
parent a81d409ce10bc25bd8b3e28f8ef87376d5fa2b5b

Check for null surface control before setting transform hint

Bug: 147109531
Test: built, boot, libgui_test
Change-Id: I4ebe256bfcdc84f1498d545bbba30117a1429e06

libs/gui/SurfaceComposerClient.cpp

diff --git a/libs/gui/SurfaceComposerClient.cpp b/libs/gui/SurfaceComposerClient.cpp
index 1d887ea..4b6ffb1 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,