commit 15fb96e63f2de336bb01e0824cc85141e5edfdea
author David Sodman <dsodman@google.com> Sun Jan 07 10:23:24 2018 -0800
committer David Sodman <dsodman@google.com> Wed Aug 22 13:43:14 2018 -0700
tree 2dc11d32d6ae0a7dff9e85c1301f226915e8b6ba
parent 8ed0c6f0ed9e9aa583ba077062fc119a3d386b1e

SF: Track compositionType across displayId's

Make sure that compositionType tracks displayId's

Bug: 112259502
Test: cts -m CtsViewTestCases
      SurfaceFlinger_test
      vrflinger_test

Change-Id: I748ef1a6da8257e780daf89af06d76f29d19ad6f

services/surfaceflinger/LayerBE.h

diff --git a/services/surfaceflinger/LayerBE.h b/services/surfaceflinger/LayerBE.h
index 0413a45..dacdc06 100644
--- a/services/surfaceflinger/LayerBE.h
+++ b/services/surfaceflinger/LayerBE.h
@@ -40,6 +40,7 @@
     std::shared_ptr<LayerBE> layer;
     struct {
         std::shared_ptr<HWC2::Layer> hwcLayer;
+        int32_t displayId = -1;
         sp<Fence> fence;
         HWC2::BlendMode blendMode = HWC2::BlendMode::Invalid;
         Rect displayFrame;