commit 3891cbe7d54d090994616dd238249d38d7a26eb2
author Ady Abraham <adyabr@google.com> Mon Mar 29 11:29:31 2021 -0700
committer Ady Abraham <adyabr@google.com> Mon Mar 29 11:30:01 2021 -0700
tree 2f420180a0cbb378ce1475db0ada39b6af936ad5
parent 4fd10d8d132754131911593ebde6281931e5f54b

SF: unsupported getLayerGenericMetadataKeys is not an error

On devices with composer < 2.4 getLayerGenericMetadataKeys is not
supported, and there should not be an error logged on boot.

Test: boot
Bug: 181269159
Change-Id: I82d9575b8a20dcb05596e2a6df4e1a9d101a6503

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;
     }