commit fbae725101ce6147795b0584fa6a68167d992dee
author Chia-I Wu <olv@google.com> Wed Oct 17 17:21:49 2018 -0700
committer android-build-merger <android-build-merger@google.com> Wed Oct 17 17:21:49 2018 -0700
tree 46e333a64a7a0735831983856f97cc82479181ff
parent a734fdda2577536a1490ae519297608576b65dcb
parent 91fb4544357e97fb32a145cebde36312389a530b

Merge "surfaceflinger: silence an error for non-WCG displays"
am: 91fb454435

Change-Id: I7b57a6112bb54d53a4f158e1a567ddec7fb49e8f

services/surfaceflinger/DisplayDevice.cpp

diff --git a/services/surfaceflinger/DisplayDevice.cpp b/services/surfaceflinger/DisplayDevice.cpp
index db095a5..309fd0a 100644
--- a/services/surfaceflinger/DisplayDevice.cpp
+++ b/services/surfaceflinger/DisplayDevice.cpp
@@ -781,9 +781,12 @@
         *outMode = iter->second.colorMode;
         *outIntent = iter->second.renderIntent;
     } else {
-        ALOGE("map unknown (%s)/(%s) to default color mode",
-              dataspaceDetails(static_cast<android_dataspace_t>(dataspace)).c_str(),
-              decodeRenderIntent(intent).c_str());
+        // this is unexpected on a WCG display
+        if (hasWideColorGamut()) {
+            ALOGE("map unknown (%s)/(%s) to default color mode",
+                  dataspaceDetails(static_cast<android_dataspace_t>(dataspace)).c_str(),
+                  decodeRenderIntent(intent).c_str());
+        }
 
         *outDataspace = Dataspace::UNKNOWN;
         *outMode = ColorMode::NATIVE;