commit 287827d2af7216f6b0f7e21561edbb08358786ab
author Steven Thomas <steventhomas@google.com> Tue Oct 01 17:56:08 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Oct 01 17:56:08 2019 +0000
tree 1e6894ccac96616c343389f394888d9d051db3b7
parent 6b09de4ed795ed47dc4e7026926f984fbd103937
parent c909845dfcdfc7c93c1c4ab7b2c586fff482e892

Merge "Return correct config from getActiveConfig()"

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 86e73c2..8b2f5e1 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -876,7 +876,16 @@
         return BAD_VALUE;
     }
 
-    return display->getActiveConfig();
+    if (display->isPrimary()) {
+        std::lock_guard<std::mutex> lock(mActiveConfigLock);
+        if (mDesiredActiveConfigChanged) {
+            return mDesiredActiveConfig.configId;
+        } else {
+            return display->getActiveConfig();
+        }
+    } else {
+        return display->getActiveConfig();
+    }
 }
 
 void SurfaceFlinger::setDesiredActiveConfig(const ActiveConfigInfo& info) {