| commit | 0594f7e67a9571155f0a6728e048d2e41a16eb1a | [log] [tgz] |
|---|---|---|
| author | Pablo Gamito <pablogamito@google.com> | Tue Jun 14 17:04:08 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jun 14 17:04:08 2022 +0000 |
| tree | 486d81555b0dbfc4fe6b240714e4a8e06bfaaddc | |
| parent | 5cf3a94bd06e9aee85eaf0e821434eef163d178c [diff] | |
| parent | f7ff793c548973a75ee52df5ce5acd93321168c2 [diff] |
Merge "Expose transaction id" into tm-qpr-dev am: d951dd2b26 am: f7ff793c54 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/18820987 Change-Id: Id677f990ed2228f03e69a2a617163661e01acad9 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 501fdae..9bc159d 100644 --- a/libs/gui/SurfaceComposerClient.cpp +++ b/libs/gui/SurfaceComposerClient.cpp
@@ -900,6 +900,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 569dbf8..9f036a6 100644 --- a/libs/gui/include/gui/SurfaceComposerClient.h +++ b/libs/gui/include/gui/SurfaceComposerClient.h
@@ -457,6 +457,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.