| commit | c9ff908aa8d79157758439fd3e93cda02655400c | [log] [tgz] |
|---|---|---|
| author | Valerie Hau <vhau@google.com> | Fri Jun 19 18:07:40 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jun 19 18:07:40 2020 +0000 |
| tree | db65acfaf2503e0b31f05b6a7d261688e1d509eb | |
| parent | f174709b45869d4fefaa96f8b26643319e161e84 [diff] | |
| parent | 109ad7156997f031717183664ac51a03110bc2b3 [diff] |
Only force send callbacks if they are registered am: 109ad71569 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/11923059 Change-Id: I7e8471a2b15b487612a682526f9e45a20136ac54
diff --git a/services/surfaceflinger/TransactionCompletedThread.cpp b/services/surfaceflinger/TransactionCompletedThread.cpp index 0cdff8f..ca24493 100644 --- a/services/surfaceflinger/TransactionCompletedThread.cpp +++ b/services/surfaceflinger/TransactionCompletedThread.cpp
@@ -154,6 +154,9 @@ status_t TransactionCompletedThread::finalizePendingCallbackHandles( const std::deque<sp<CallbackHandle>>& handles) { + if (handles.empty()) { + return NO_ERROR; + } std::lock_guard lock(mMutex); if (!mRunning) { ALOGE("cannot add presented callback handle because the callback thread isn't running");