commit 2942fce2cda6629556c7afcc9bd4c359778d3c97
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Dec 17 21:49:01 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Dec 17 21:49:01 2019 +0000
tree 388eb6b889d960cf07253820928a54de4df8dc92
parent a6a4ed3aadbd4afda761a212907d81baedba4981
parent dfca3ecce2a0c045aa943fc4dfd6d2d33d43a1e0

Merge "Fix callback drop"

services/surfaceflinger/TransactionCompletedThread.cpp

diff --git a/services/surfaceflinger/TransactionCompletedThread.cpp b/services/surfaceflinger/TransactionCompletedThread.cpp
index 8db03db..4c1baaf 100644
--- a/services/surfaceflinger/TransactionCompletedThread.cpp
+++ b/services/surfaceflinger/TransactionCompletedThread.cpp
@@ -311,8 +311,16 @@
                     interface_cast<ITransactionCompletedListener>(listenerStats.listener)
                             ->onTransactionCompleted(listenerStats);
                     listener->unlinkToDeath(mDeathRecipient);
+                    if (transactionStatsDeque.empty()) {
+                        completedTransactionsItr =
+                                mCompletedTransactions.erase(completedTransactionsItr);
+                    } else {
+                        completedTransactionsItr++;
+                    }
+                } else {
+                    completedTransactionsItr =
+                            mCompletedTransactions.erase(completedTransactionsItr);
                 }
-                completedTransactionsItr = mCompletedTransactions.erase(completedTransactionsItr);
             } else {
                 completedTransactionsItr++;
             }