DO NOT MERGE: revert HWC2 changes
The changes are causing some issues with multi-window use cases.
Fixes: 64491794
Test: test gmail compose in multi-window + show taps enabled
Change-Id: I0b0a3f351ed48f81db89a71c78bf17bab8cb2acf
Signed-off-by: Adrian Salido <salidoa@google.com>
diff --git a/drmdisplaycomposition.cpp b/drmdisplaycomposition.cpp
index 293160b..949f4a3 100644
--- a/drmdisplaycomposition.cpp
+++ b/drmdisplaycomposition.cpp
@@ -258,10 +258,8 @@
if (!layer->release_fence)
continue;
int ret = layer->release_fence.Set(CreateNextTimelineFence());
- if (ret < 0) {
- ALOGE("Failed to set the release fence (squash) %d", ret);
+ if (ret < 0)
return ret;
- }
}
timeline_squash_done_ = timeline_;
@@ -278,10 +276,8 @@
if (!layer->release_fence)
continue;
int ret = layer->release_fence.Set(CreateNextTimelineFence());
- if (ret < 0) {
- ALOGE("Failed to set the release fence (comp) %d", ret);
+ if (ret < 0)
return ret;
- }
}
return 0;