summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Prod User <android-build-prod@system.gserviceaccount.com>2023-03-23 18:02:48 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2023-03-23 18:02:48 +0000
commitc99be129b7f2fbc71c333298ddbe31445d3e7507 (patch)
tree96be04db1d9cd7aaa9619fb890aa7a5ae384487d
parent0ff19a2f3af2650a4a2f509565331b809bb49744 (diff)
parent4e7ee91e382e2d14829d029472ca6646e113ac73 (diff)
Merge "sf: add mStateLock in checkVirtualDisplayHint API" into t-keystone-qcom-dev
-rw-r--r--services/surfaceflinger/SurfaceFlinger.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index a4aa6904e3..ebb202f1b7 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -5558,6 +5558,7 @@ bool SurfaceFlinger::applyTransactionState(const FrameTimelineInfo& frameTimelin
}
void SurfaceFlinger::checkVirtualDisplayHint(const Vector<DisplayState>& displays) {
+ Mutex::Autolock lock(mStateLock);
for (const DisplayState& s : displays) {
const ssize_t index = mCurrentState.displays.indexOfKey(s.token);
if (index < 0)