Merge "Remove GenericMetadata from composer3"

1 files changed, 0 insertions, 11 deletions

diff --git a/hwc3/ComposerCommandEngine.cpp b/hwc3/ComposerCommandEngine.cpp
index b272172..062ec1e 100644
--- a/hwc3/ComposerCommandEngine.cpp
+++ b/hwc3/ComposerCommandEngine.cpp
@@ -98,7 +98,6 @@ void ComposerCommandEngine::dispatchLayerCommand(int64_t display, const LayerCom
     DISPATCH_LAYER_COMMAND(display, command, colorTransform, ColorTransform);
     // TODO: (b/196171661) add support for mixed composition
     // DISPATCH_LAYER_COMMAND(display, command, whitePointNits, WhitePointNits);
-    DISPATCH_LAYER_COMMAND(display, command, genericMetadata, GenericMetadata);
     DISPATCH_LAYER_COMMAND(display, command, perFrameMetadata, PerFrameMetadata);
     DISPATCH_LAYER_COMMAND(display, command, perFrameMetadataBlob, PerFrameMetadataBlobs);
 }
@@ -406,14 +405,4 @@ void ComposerCommandEngine::executeSetLayerPerFrameMetadataBlobs(int64_t display
     }
 }
 
-void ComposerCommandEngine::executeSetLayerGenericMetadata(int64_t display, int64_t layer,
-                                                           const GenericMetadata& metadata) {
-    auto err =
-            mHal->setLayerGenericMetadata(display, layer, metadata);
-    if (err) {
-        LOG(ERROR) << __func__ << ": err " << err;
-        mWriter->setError(mCommandIndex, err);
-    }
-}
-
 } // namespace aidl::android::hardware::graphics::composer3::impl