commit a39238eec91605186771bc2181d242570b32dc11
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Oct 07 19:37:44 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Oct 07 19:37:44 2022 +0000
tree ee355161427c27a5676faf7909aa69fd0dd9c66f
parent 860c2bf73275343cac599cb1a44e6f67c6e65047
parent 9a11a2ea839d5a9dd692211693692f65bb1da2eb

Merge "Restore display decoration if device supports it"

libs/gui/SurfaceComposerClient.cpp

diff --git a/libs/gui/SurfaceComposerClient.cpp b/libs/gui/SurfaceComposerClient.cpp
index c596fc7..955cb59 100644
--- a/libs/gui/SurfaceComposerClient.cpp
+++ b/libs/gui/SurfaceComposerClient.cpp
@@ -2740,8 +2740,7 @@
             ComposerServiceAIDL::getComposerService()->getDisplayDecorationSupport(displayToken,
                                                                                    &gsupport);
     std::optional<DisplayDecorationSupport> support;
-    // TODO (b/241277093): Remove `false && ` once b/241278870 is fixed.
-    if (false && status.isOk() && gsupport.has_value()) {
+    if (status.isOk() && gsupport.has_value()) {
         support.emplace(DisplayDecorationSupport{
           .format =
                 static_cast<aidl::android::hardware::graphics::common::PixelFormat>(