summaryrefslogtreecommitdiff
path: root/services/surfaceflinger/TransactionCallbackInvoker.cpp
diff options
context:
space:
mode:
author Melody Hsu <melodymhsu@google.com> 2024-10-17 21:42:50 +0000
committer Melody Hsu <melodymhsu@google.com> 2024-10-17 21:45:45 +0000
commit0077fde3aba6f2bde4e878f88c0dd466350fc1b1 (patch)
tree403bec4cc619caa603cb76f85548e1f6dd736e9b /services/surfaceflinger/TransactionCallbackInvoker.cpp
parent2c9c078368c0e47b07cdeb0e17456c26e686dc9d (diff)
Remove release fence flags
ce_fence_promise and screenshot_fence_preservation flags have been out for several releases. They can be deleted, along with any obsolete code related to the flag removal. Bug: 351894825 Test: atest SurfaceFlinger_test Flag: EXEMPT flag removal Change-Id: Iba6166358c96ff6cfe5c64b68640fcd992c4089f
Diffstat (limited to 'services/surfaceflinger/TransactionCallbackInvoker.cpp')
-rw-r--r--services/surfaceflinger/TransactionCallbackInvoker.cpp11
1 files changed, 2 insertions, 9 deletions
diff --git a/services/surfaceflinger/TransactionCallbackInvoker.cpp b/services/surfaceflinger/TransactionCallbackInvoker.cpp
index c6856aea75..de4825ba62 100644
--- a/services/surfaceflinger/TransactionCallbackInvoker.cpp
+++ b/services/surfaceflinger/TransactionCallbackInvoker.cpp
@@ -28,7 +28,6 @@
#include "Utils/FenceUtils.h"
#include <binder/IInterface.h>
-#include <common/FlagManager.h>
#include <common/trace.h>
#include <utils/RefBase.h>
@@ -127,14 +126,8 @@ status_t TransactionCallbackInvoker::addCallbackHandle(const sp<CallbackHandle>&
if (surfaceControl) {
sp<Fence> prevFence = nullptr;
- if (FlagManager::getInstance().ce_fence_promise()) {
- for (auto& future : handle->previousReleaseFences) {
- mergeFence(handle->name.c_str(), future.get().value_or(Fence::NO_FENCE), prevFence);
- }
- } else {
- for (const auto& future : handle->previousSharedReleaseFences) {
- mergeFence(handle->name.c_str(), future.get().value_or(Fence::NO_FENCE), prevFence);
- }
+ for (auto& future : handle->previousReleaseFences) {
+ mergeFence(handle->name.c_str(), future.get().value_or(Fence::NO_FENCE), prevFence);
}
handle->previousReleaseFence = prevFence;