commit 0c17852e9a23d68f41d94c4f19eba1d5b4fc267a
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Jun 09 10:08:41 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jun 09 10:08:41 2020 +0000
tree 04d738c54578bbfbd2de55cea3b015c192fe77f4
parent a464c38ba5fc3361ddd0b9e55d04f98617da4c37
parent 94ea676e92146ce7226c3b019c3a8f48216c8cb0

Merge "[SF] Don't crash if HWC returns an unknown config" into rvc-dev am: 9b89dd7a12 am: 200ccf7d15 am: cb30bb5f66 am: 94ea676e92

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

Change-Id: I42e0b5b09b720c8b96259b2890b74d979781d668

services/surfaceflinger/DisplayHardware/HWC2.cpp

diff --git a/services/surfaceflinger/DisplayHardware/HWC2.cpp b/services/surfaceflinger/DisplayHardware/HWC2.cpp
index af76b81..8ac0561 100644
--- a/services/surfaceflinger/DisplayHardware/HWC2.cpp
+++ b/services/surfaceflinger/DisplayHardware/HWC2.cpp
@@ -208,13 +208,17 @@
         *outVsyncPeriod = static_cast<nsecs_t>(vsyncPeriodNanos);
     } else {
         // Get the default vsync period
-        HWConfigId configId = 0;
-        auto intError_2_1 = mComposer.getActiveConfig(mId, &configId);
-        error = static_cast<Error>(intError_2_1);
-        if (error == Error::NONE) {
-            auto config = mConfigs.at(configId);
-            *outVsyncPeriod = config->getVsyncPeriod();
+        std::shared_ptr<const Display::Config> config;
+        error = getActiveConfig(&config);
+        if (error != Error::NONE) {
+            return error;
         }
+        if (!config) {
+            // HWC has updated the display modes and hasn't notified us yet.
+            return Error::BAD_CONFIG;
+        }
+
+        *outVsyncPeriod = config->getVsyncPeriod();
     }
 
     return error;