commit e7382c1cde2a381aad705f46943849b2d6cf8ba9
author Huihong Luo <huisinro@google.com> Fri Apr 21 20:24:32 2023 +0000
committer Huihong Luo <huisinro@google.com> Sat Apr 22 04:10:44 2023 +0000
tree f263e880d5cc0310ddef8d72720a82cffb5d78c9
parent e469593af9a8220d82d91cc815e0aee317fef45e

Reset pending commands

Allow takePendingCommands to have ownership for mComamnds so commands
are reset on each call. resetCommands methods are removed since they
are not really used.

Bug: 273525126
Test: manual
Change-Id: If91cf6253b0d8f0d8c5d761f7cf257d090fcaf6f

services/surfaceflinger/DisplayHardware/AidlComposerHal.cpp

diff --git a/services/surfaceflinger/DisplayHardware/AidlComposerHal.cpp b/services/surfaceflinger/DisplayHardware/AidlComposerHal.cpp
index f28bfd4..f7049b9 100644
--- a/services/surfaceflinger/DisplayHardware/AidlComposerHal.cpp
+++ b/services/surfaceflinger/DisplayHardware/AidlComposerHal.cpp
@@ -329,14 +329,6 @@
     }
 }
 
-void AidlComposer::resetCommands(Display display) {
-    mMutex.lock_shared();
-    if (auto writer = getWriter(display)) {
-        writer->get().reset();
-    }
-    mMutex.unlock_shared();
-}
-
 Error AidlComposer::executeCommands(Display display) {
     mMutex.lock_shared();
     auto error = execute(display);
@@ -1054,9 +1046,8 @@
         return Error::BAD_DISPLAY;
     }
 
-    const auto& commands = writer->get().getPendingCommands();
+    auto commands = writer->get().takePendingCommands();
     if (commands.empty()) {
-        writer->get().reset();
         return Error::NONE;
     }
 
@@ -1088,8 +1079,6 @@
         }
     }
 
-    writer->get().reset();
-
     return error;
 }