commit deb33c0f90f465bdf833424940e6f7f6e43aee0b
author Chia-I Wu <olv@google.com> Wed Oct 17 17:47:45 2018 -0700
committer android-build-merger <android-build-merger@google.com> Wed Oct 17 17:47:45 2018 -0700
tree 181d59740d9945d1bb110ceab49fb0ca30d0017c
parent b376e445b9ba1526f3d794706f43f4d04d645db4
parent aa87867c709bb6e60196e70291e5cc3ca41653e0

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

Change-Id: I5f258cf949244ec85e01d5406a146e147899dd2c

services/surfaceflinger/DisplayDevice.cpp

diff --git a/services/surfaceflinger/DisplayDevice.cpp b/services/surfaceflinger/DisplayDevice.cpp
index 341dfd5..60cad02 100644
--- a/services/surfaceflinger/DisplayDevice.cpp
+++ b/services/surfaceflinger/DisplayDevice.cpp
@@ -767,9 +767,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;