commit 1162e4703be6f1a9e2958be20171930b13a37874
author Dominik Laskowski <domlaskowski@google.com> Thu Apr 02 19:02:47 2020 -0700
committer Dominik Laskowski <domlaskowski@google.com> Thu Apr 02 20:23:10 2020 -0700
tree ad2270707666d172d06f0cbe520b233268d752a7
parent edbc86de0530ebe4919ce9a84b221f4f32fd67e1

SF: Fix color transform for composited virtual displays

ag/6455586 inadvertently changed the condition to never skip it.

Bug: 149968803
Test: Overlay display is not doubly sepia when Night Light is on.
Test: libcompositionengine_test
Change-Id: Ic33ba3069be8544ada1304461ab881b39b9fd1f9

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 2da92b3..e419125 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -1199,7 +1199,7 @@
               displayToken.get());
         return NAME_NOT_FOUND;
     }
-    *outSupport = getHwComposer().hasDisplayCapability(displayId,
+    *outSupport = getHwComposer().hasDisplayCapability(*displayId,
                                                        HWC2::DisplayCapability::AutoLowLatencyMode);
     return NO_ERROR;
 }
@@ -1470,7 +1470,7 @@
         return NAME_NOT_FOUND;
     }
     *outSupport =
-            getHwComposer().hasDisplayCapability(displayId, HWC2::DisplayCapability::Brightness);
+            getHwComposer().hasDisplayCapability(*displayId, HWC2::DisplayCapability::Brightness);
     return NO_ERROR;
 }