Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 204e5b50 authored by Liz Prucka's avatar Liz Prucka Committed by Automerger Merge Worker
Browse files

Merge "Error fix from enabling Clang thread-safety checks" into main am: bdacb5d4 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3341242



Change-Id: I3f318b392ce28e06596da2b4e88ca846554778a0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0596b7af bdacb5d4

services/surfaceflinger/tests/unittests/FrameTimelineTest.cpp

+1 −0
Original line number Diff line number Diff line
@@ -166,6 +166,7 @@ public: 
                a.presentTime == b.presentTime;

    }



    NO_THREAD_SAFETY_ANALYSIS

    const std::map<int64_t, TimelineItem>& getPredictions() const {

        return mTokenManager->mPredictions;

    }