commit 5e265d2ec93c8269da121a0cc8f3bd8b5c705e8d
author Winson Chung <winsonc@google.com> Wed Sep 15 18:42:45 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Sep 15 18:42:45 2021 +0000
tree 8b0f297882210056a90891071be82b31ecc91a30
parent 5f72bf2ca47e5d0960b6201455ffc0eb2653d6e6
parent 71c4ccd5c449e3ce5a6ecb1ca1fa408a10d5451b

Merge "Initialize DrawingState::trustedOverlay to false in constructor" into stage-aosp-master am: 774787c7ce am: 55bae46ca1 am: 71c4ccd5c4

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/15829456

Change-Id: I688317c3da804223fadaceebd8b1d9c961c3bfec

services/surfaceflinger/Layer.cpp

diff --git a/services/surfaceflinger/Layer.cpp b/services/surfaceflinger/Layer.cpp
index 7cfc321..638bb9b 100644
--- a/services/surfaceflinger/Layer.cpp
+++ b/services/surfaceflinger/Layer.cpp
@@ -134,6 +134,7 @@
     mDrawingState.frameTimelineInfo = {};
     mDrawingState.postTime = -1;
     mDrawingState.destinationFrame.makeInvalid();
+    mDrawingState.isTrustedOverlay = false;
 
     if (args.flags & ISurfaceComposerClient::eNoColorFill) {
         // Set an invalid color so there is no color fill.