summaryrefslogtreecommitdiff
path: root/services/surfaceflinger/Layer.h
diff options
context:
space:
mode:
author Rob Carr <racarr@google.com> 2021-06-17 17:56:24 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2021-06-17 17:56:24 +0000
commitc67c384ea4d500c655557ee32c12a08bbcaa57a5 (patch)
treef9edb3b5d93af7aa396a6ef95a3a9f4b3c195430 /services/surfaceflinger/Layer.h
parent603a15d295579ea583fbad2cb9c15cf41dd598dc (diff)
parent38d2500594652eabe7ee989d40b7190a26c577cc (diff)
Merge "Layer: Don't need atomic for transaction flags" into sc-dev
Diffstat (limited to 'services/surfaceflinger/Layer.h')
-rw-r--r--services/surfaceflinger/Layer.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/surfaceflinger/Layer.h b/services/surfaceflinger/Layer.h
index 58731036d7..5669049512 100644
--- a/services/surfaceflinger/Layer.h
+++ b/services/surfaceflinger/Layer.h
@@ -960,7 +960,7 @@ protected:
// these are protected by an external lock (mStateLock)
State mCurrentState;
- std::atomic<uint32_t> mTransactionFlags{0};
+ uint32_t mTransactionFlags{0};
// Timestamp history for UIAutomation. Thread safe.
FrameTracker mFrameTracker;