Merge "Error fix from enabling Clang thread-safety checks" into main am: bdacb5d am: 204e5b5

eprucka3 · android-build-merge-worker-robot · commit 9accf30e2180 · 2024-11-15T19:57:45.000Z
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3341242 Change-Id: Icc9cd959719b691bdbf1db74d842ce8f98d5ad9e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/services/surfaceflinger/tests/unittests/FrameTimelineTest.cpp b/services/surfaceflinger/tests/unittests/FrameTimelineTest.cpp
@@ -166,6 +166,7 @@ class FrameTimelineTest : public testing::Test {
                 a.presentTime == b.presentTime;
     }
 
+    NO_THREAD_SAFETY_ANALYSIS
     const std::map<int64_t, TimelineItem>& getPredictions() const {
         return mTokenManager->mPredictions;
     }

Original file line number	Diff line number	Diff line change
`@@ -166,6 +166,7 @@ class FrameTimelineTest : public testing::Test {`
`166`	`166`	`a.presentTime == b.presentTime;`
`167`	`167`	`}`
`168`	`168`
	`169`	`+ NO_THREAD_SAFETY_ANALYSIS`
`169`	`170`	`const std::map<int64_t, TimelineItem>& getPredictions() const {`
`170`	`171`	`return mTokenManager->mPredictions;`
`171`	`172`	`}`