| commit | f7ff793c548973a75ee52df5ce5acd93321168c2 | [log] [tgz] |
|---|---|---|
| author | Pablo Gamito <pablogamito@google.com> | Tue Jun 14 16:06:42 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jun 14 16:06:42 2022 +0000 |
| tree | b9049723a175da726ff55be1ad2b70a4fe44e5de | |
| parent | efe59d3e1c3973bb3d853461219e862ec1b232c9 [diff] | |
| parent | d951dd2b263a063232e28fb805681c874a58a93b [diff] |
Merge "Expose transaction id" into tm-qpr-dev am: d951dd2b26 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/18820987 Change-Id: I8b72f8e85f4405ebec00220b46918aa02ed47f11 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/libs/gui/SurfaceComposerClient.cpp b/libs/gui/SurfaceComposerClient.cpp index 47d801a..9358e29 100644 --- a/libs/gui/SurfaceComposerClient.cpp +++ b/libs/gui/SurfaceComposerClient.cpp
@@ -897,6 +897,10 @@ mApplyToken = nullptr; } +uint64_t SurfaceComposerClient::Transaction::getId() { + return mId; +} + void SurfaceComposerClient::doUncacheBufferTransaction(uint64_t cacheId) { sp<ISurfaceComposer> sf(ComposerService::getComposerService());
diff --git a/libs/gui/include/gui/SurfaceComposerClient.h b/libs/gui/include/gui/SurfaceComposerClient.h index efbdb36..b598b43 100644 --- a/libs/gui/include/gui/SurfaceComposerClient.h +++ b/libs/gui/include/gui/SurfaceComposerClient.h
@@ -461,6 +461,10 @@ // Clears the contents of the transaction without applying it. void clear(); + // Returns the current id of the transaction. + // The id is updated every time the transaction is applied. + uint64_t getId(); + status_t apply(bool synchronous = false, bool oneWay = false); // Merge another transaction in to this one, clearing other // as if it had been applied.