| commit | bdacb5d402092c572258f1f71e85f9d5ad44a835 | [log] [tgz] |
|---|---|---|
| author | Liz Prucka <lizprucka@google.com> | Fri Nov 15 19:15:34 2024 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Fri Nov 15 19:15:34 2024 +0000 |
| tree | 9f862717ebae45a9157c715f75ce029a93a86bb6 | |
| parent | 81bc772fa19faa4dcd3d1b032e1d93c0f83d47af [diff] | |
| parent | 31b58c9b2067adec8a262643b2447196f02321e1 [diff] |
Merge "Error fix from enabling Clang thread-safety checks" into main
diff --git a/services/surfaceflinger/tests/unittests/FrameTimelineTest.cpp b/services/surfaceflinger/tests/unittests/FrameTimelineTest.cpp index dac9265..fae236d 100644 --- a/services/surfaceflinger/tests/unittests/FrameTimelineTest.cpp +++ b/services/surfaceflinger/tests/unittests/FrameTimelineTest.cpp
@@ -158,6 +158,7 @@ a.presentTime == b.presentTime; } + NO_THREAD_SAFETY_ANALYSIS const std::map<int64_t, TimelineItem>& getPredictions() const { return mTokenManager->mPredictions; }