commit 6d6cfa493a0d91ad5c73853aa219a355af6fbded
author Ady Abraham <adyabr@google.com> Fri Nov 15 16:13:28 2019 -0800
committer android-build-merger <android-build-merger@google.com> Fri Nov 15 16:13:28 2019 -0800
tree e1e0e981d3da9a80bf19f9d72c1d11ee7dd4c4ff
parent e83f01fef5b10de09b5facd8fe77c4296ed03585
parent abf9106001addb6aea15c681ae8c2cc347fc93bd

SurfaceFlinger: lock mStateLock when modifying allowed configs
am: abf9106001

Change-Id: Id6ec56a597601d185324a52b5369d054bc57a151

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 60b3a11..dbeae31 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -6236,7 +6236,7 @@
         return NO_ERROR;
     }
 
-    postMessageSync(new LambdaMessage([&]() NO_THREAD_SAFETY_ANALYSIS {
+    postMessageSync(new LambdaMessage([&]() {
         const auto display = getDisplayDeviceLocked(displayToken);
         if (!display) {
             ALOGE("Attempt to set allowed display configs for invalid display token %p",
@@ -6244,6 +6244,7 @@
         } else if (display->isVirtual()) {
             ALOGW("Attempt to set allowed display configs for virtual display");
         } else {
+            Mutex::Autolock lock(mStateLock);
             setAllowedDisplayConfigsInternal(display, allowedConfigs);
         }
     }));