From 84d87ffc91d35d41d98d741258c40a367ba503fa Mon Sep 17 00:00:00 2001
From: Valerie Hau <vhau@google.com>
Date: Wed, 8 Jan 2020 17:23:21 -0800
Subject: Check for null surface control before setting transform hint

Bug: 147109531
Test: built, boot, libgui_test
Change-Id: I4ebe256bfcdc84f1498d545bbba30117a1429e06
---
 libs/gui/SurfaceComposerClient.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'libs/gui/SurfaceComposerClient.cpp')

diff --git a/libs/gui/SurfaceComposerClient.cpp b/libs/gui/SurfaceComposerClient.cpp
index 1d887ea931..4b6ffb174d 100644
--- a/libs/gui/SurfaceComposerClient.cpp
+++ b/libs/gui/SurfaceComposerClient.cpp
@@ -225,9 +225,11 @@ void TransactionCompletedListener::onTransactionCompleted(ListenerStats listener
                                               .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,
-- 
cgit v1.2.3-59-g8ed1b