Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8118fae5 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 11860797 from af54782a to 24Q3-release

Change-Id: I772e9bc6f159ca79fa4c2c392f55070455630dfd
parents bbc5db09 af54782a
Loading
Loading
Loading
Loading
+14 −0
Original line number Diff line number Diff line
@@ -288,6 +288,20 @@ class VtsDisplay {
        return false;
    }

    std::string printConfig(int config) {
        const auto displayConfig = getDisplayConfig(config);
        const auto vrrConfigOpt = displayConfig.vrrConfigOpt;
        std::stringstream ss;
        if (displayConfig.vrrConfigOpt) {
            ss << "{Config " << config << ": vsyncPeriod " << displayConfig.vsyncPeriod
                << ", minFrameIntervalNs " << vrrConfigOpt->minFrameIntervalNs << "}";
        }
        else {
            ss << "{Config " << config << ": vsyncPeriod " << displayConfig.vsyncPeriod << "}";
        }
        return ss.str();
    }

    std::unordered_map<int32_t, DisplayConfig> getDisplayConfigs() { return mDisplayConfigs; }

  private:
+3 −2
Original line number Diff line number Diff line
@@ -2877,8 +2877,9 @@ TEST_P(GraphicsComposerAidlCommandV2Test,
            } while (--retryCount > 0);

            if (retryCount == 0) {
                GTEST_FAIL() << "failed to get a callback for the display " << displayId
                             << " with config " << config2;
                GTEST_FAIL() << "Failed to get a callback for Display " << displayId
                             << " switching from " << display.printConfig(config1)
                             << " to " << display.printConfig(config2);
            }
        });