commit 3a8da0222e08355dcd3fbe269c84c18ded176b6d
author android-build-team Robot <android-build-team-robot@google.com> Wed Nov 14 04:06:38 2018 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Wed Nov 14 04:06:38 2018 +0000
tree 34ef6af14a8d61656c237b0bb734bd270f7ba395
parent 473b3b029750f448900150f1cd85b437c334d5ba
parent 256bb66d02e3cae7a439594a16228d6f462ff9a1

Snap for 5130385 from 256bb66d02e3cae7a439594a16228d6f462ff9a1 to pi-qpr2-release

Change-Id: I75ea8ba160a7f2be3421b3a388f7ad6e4ea07ea5

services/surfaceflinger/tests/unittests/DisplayTransactionTest.cpp

diff --git a/services/surfaceflinger/tests/unittests/DisplayTransactionTest.cpp b/services/surfaceflinger/tests/unittests/DisplayTransactionTest.cpp
index 9ac5f3b..9b308bf 100644
--- a/services/surfaceflinger/tests/unittests/DisplayTransactionTest.cpp
+++ b/services/surfaceflinger/tests/unittests/DisplayTransactionTest.cpp
@@ -658,7 +658,8 @@
 using SimpleHwcVirtualDisplayVariant = HwcVirtualDisplayVariant<1024, 768, Secure::TRUE>;
 using HwcVirtualDisplayCase =
         Case<SimpleHwcVirtualDisplayVariant, WideColorSupportNotConfiguredVariant,
-             NonHwcDisplayHdrSupportVariant, NonHwcPerFrameMetadataSupportVariant>;
+             HdrNotSupportedVariant<SimpleHwcVirtualDisplayVariant>,
+             NoPerFrameMetadataSupportVariant<SimpleHwcVirtualDisplayVariant>>;
 using WideColorP3ColorimetricDisplayCase =
         Case<PrimaryDisplayVariant, WideColorP3ColorimetricSupportedVariant<PrimaryDisplayVariant>,
              HdrNotSupportedVariant<PrimaryDisplayVariant>,