commit 261614e00d042b23611c2ef64bcafcbe7c5993e6
author Ady Abraham <adyabr@google.com> Wed Jul 10 17:53:12 2019 -0700
committer Ady Abraham <adyabr@google.com> Wed Jul 10 17:53:12 2019 -0700
tree f1eb35c92a2fafae682af1d1710639d775b1b13c
parent d7e5236ade209b5bca6e2011cf2ddc063f7e5801

SurfaceFlinger: use isDisplayConfigAllowed in dumpVSync()

Simplify the logic to dump the allowed display configs.

Test: adb shell dumpsys SurfaceFlinger
Change-Id: Id0c5f86779fc434f316c9da63e0118e2fc7de458

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 6ebfc0d..47c17d0 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -1477,7 +1477,7 @@
     *compositorTiming = getBE().mCompositorTiming;
 }
 
-bool SurfaceFlinger::isDisplayConfigAllowed(int32_t configId) {
+bool SurfaceFlinger::isDisplayConfigAllowed(int32_t configId) const {
     return mAllowedDisplayConfigs.empty() || mAllowedDisplayConfigs.count(configId);
 }
 
@@ -4710,11 +4710,9 @@
     StringAppendF(&result, "+  Smart 90 for video detection: %s\n\n",
                   mUseSmart90ForVideo ? "on" : "off");
     StringAppendF(&result, "Allowed Display Configs: ");
-    for (int32_t configId : mAllowedDisplayConfigs) {
-        for (auto refresh : mRefreshRateConfigs.getRefreshRates()) {
-            if (refresh.second && refresh.second->configId == configId) {
-                StringAppendF(&result, "%dHz, ", refresh.second->fps);
-            }
+    for (auto refresh : mRefreshRateConfigs.getRefreshRates()) {
+        if (refresh.second && isDisplayConfigAllowed(refresh.second->configId)) {
+            StringAppendF(&result, "%dHz, ", refresh.second->fps);
         }
     }
     StringAppendF(&result, "(config override by backdoor: %s)\n\n",