diff options
| author | 2024-11-15 19:34:28 +0000 | |
|---|---|---|
| committer | 2024-11-15 19:34:28 +0000 | |
| commit | 204e5b5031bc4ab385c4f79c848a7f08c0ab4dc3 (patch) | |
| tree | df66df6773ade6c227120ad2bc8b0e8a237e92a1 | |
| parent | 0596b7af7695b044fa81a566dbc8e8ad1b163fc7 (diff) | |
| parent | bdacb5d402092c572258f1f71e85f9d5ad44a835 (diff) | |
Merge "Error fix from enabling Clang thread-safety checks" into main am: bdacb5d402
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3341242
Change-Id: I3f318b392ce28e06596da2b4e88ca846554778a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/surfaceflinger/tests/unittests/FrameTimelineTest.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/services/surfaceflinger/tests/unittests/FrameTimelineTest.cpp b/services/surfaceflinger/tests/unittests/FrameTimelineTest.cpp index 0dfbd6185e..08e426564a 100644 --- a/services/surfaceflinger/tests/unittests/FrameTimelineTest.cpp +++ b/services/surfaceflinger/tests/unittests/FrameTimelineTest.cpp @@ -166,6 +166,7 @@ public: a.presentTime == b.presentTime; } + NO_THREAD_SAFETY_ANALYSIS const std::map<int64_t, TimelineItem>& getPredictions() const { return mTokenManager->mPredictions; } |