commit e6b5063ad19b7002424e843a10ad1e1144280a7f
author Ady Abraham <adyabr@google.com> Tue Mar 30 19:56:19 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 30 19:56:19 2021 +0000
tree 4d020f1893f2c46b8b67e9302e824222b6ff0624
parent acbdfd84bf82499f627f31d8f6ff01c0ffb3bcdb
parent 3891cbe7d54d090994616dd238249d38d7a26eb2

Merge "SF: unsupported getLayerGenericMetadataKeys is not an error" into sc-dev

services/surfaceflinger/DisplayHardware/HWComposer.cpp

diff --git a/services/surfaceflinger/DisplayHardware/HWComposer.cpp b/services/surfaceflinger/DisplayHardware/HWComposer.cpp
index ccfaa76..fe957c0 100644
--- a/services/surfaceflinger/DisplayHardware/HWComposer.cpp
+++ b/services/surfaceflinger/DisplayHardware/HWComposer.cpp
@@ -964,8 +964,10 @@
     std::vector<Hwc2::IComposerClient::LayerGenericMetadataKey> supportedMetadataKeyInfo;
     const auto error = mComposer->getLayerGenericMetadataKeys(&supportedMetadataKeyInfo);
     if (error != hardware::graphics::composer::V2_4::Error::NONE) {
-        ALOGE("%s: %s failed: %s (%d)", __FUNCTION__, "getLayerGenericMetadataKeys",
-              toString(error).c_str(), static_cast<int32_t>(error));
+        if (error != hardware::graphics::composer::V2_4::Error::UNSUPPORTED) {
+            ALOGE("%s: %s failed: %s (%d)", __FUNCTION__, "getLayerGenericMetadataKeys",
+                  toString(error).c_str(), static_cast<int32_t>(error));
+        }
         return;
     }