commit ecd23b1638f7a4f807d9832bdea491fef0409929
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Nov 01 03:27:24 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Nov 01 03:27:24 2022 +0000
tree 72ae604b7ff9601c88ba3cda4ec1a6ec35aa2f07
parent 8add42b2be0c64b139c5609811930f1f3e1ab25b
parent e31f06a0e1d0704cc25c588158c57cf94077a5fd

Merge "surfaceflinger_fuzzer : Resolved memory leak"

services/surfaceflinger/fuzzer/surfaceflinger_fuzzer.cpp

diff --git a/services/surfaceflinger/fuzzer/surfaceflinger_fuzzer.cpp b/services/surfaceflinger/fuzzer/surfaceflinger_fuzzer.cpp
index 14384a7..ce4d18f 100644
--- a/services/surfaceflinger/fuzzer/surfaceflinger_fuzzer.cpp
+++ b/services/surfaceflinger/fuzzer/surfaceflinger_fuzzer.cpp
@@ -245,6 +245,7 @@
     setDisplayStateLocked();
 
     setTransactionState();
+    mTestableFlinger.flushTransactionQueues();
 
     onTransact(data, size);
 }

services/surfaceflinger/fuzzer/surfaceflinger_fuzzers_utils.h

diff --git a/services/surfaceflinger/fuzzer/surfaceflinger_fuzzers_utils.h b/services/surfaceflinger/fuzzer/surfaceflinger_fuzzers_utils.h
index e555867..502b55a 100644
--- a/services/surfaceflinger/fuzzer/surfaceflinger_fuzzers_utils.h
+++ b/services/surfaceflinger/fuzzer/surfaceflinger_fuzzers_utils.h
@@ -748,6 +748,11 @@
                                              listenerCallbacks, transactionId);
     }
 
+    auto flushTransactionQueues() {
+        ftl::FakeGuard guard(kMainThreadContext);
+        return mFlinger->flushTransactionQueues(VsyncId{0});
+    }
+
     auto onTransact(uint32_t code, const Parcel &data, Parcel *reply, uint32_t flags) {
         return mFlinger->onTransact(code, data, reply, flags);
     }