commit 263a3f1f1b7a316eb78a9034c976c0c3b26171f1
author ramindani <ramindani@google.com> Tue Jul 18 20:44:49 2023 -0700
committer Ram Indani <ramindani@google.com> Sat Jul 22 01:12:50 2023 +0000
tree fadfba15ce708b7e0b0f4d9c20934747c59238e8
parent 227a7f8fd9cbc8e4105bfb8d0688aa5f37c0d9a7

[SF] Updates to incorporate vrr aidl interface changes

Test: builds, atest libsurfaceflinger_unittest
BUG: 284881912
BUG: 287517352
Change-Id: Icf7b23686c26108b0681ccbeea8d3591211a2611

services/surfaceflinger/tests/unittests/HWComposerTest.cpp

diff --git a/services/surfaceflinger/tests/unittests/HWComposerTest.cpp b/services/surfaceflinger/tests/unittests/HWComposerTest.cpp
index ec8069d..8a45f17 100644
--- a/services/surfaceflinger/tests/unittests/HWComposerTest.cpp
+++ b/services/surfaceflinger/tests/unittests/HWComposerTest.cpp
@@ -123,6 +123,7 @@
 TEST_F(HWComposerTest, getModesWithLegacyDisplayConfigs) {
     constexpr hal::HWDisplayId kHwcDisplayId = 2;
     constexpr hal::HWConfigId kConfigId = 42;
+    constexpr int32_t kMaxFrameIntervalNs = 50000000; // 20Fps
 
     expectHotplugConnect(kHwcDisplayId);
     const auto info = mHwc.onHotplug(kHwcDisplayId, hal::Connection::CONNECTED);
@@ -133,7 +134,7 @@
     {
         EXPECT_CALL(*mHal, getDisplayConfigs(kHwcDisplayId, _))
                 .WillOnce(Return(HalError::BAD_DISPLAY));
-        EXPECT_TRUE(mHwc.getModes(info->id).empty());
+        EXPECT_TRUE(mHwc.getModes(info->id, kMaxFrameIntervalNs).empty());
     }
     {
         constexpr int32_t kWidth = 480;
@@ -172,7 +173,7 @@
                 .WillRepeatedly(DoAll(SetArgPointee<1>(std::vector<hal::HWConfigId>{kConfigId}),
                                       Return(HalError::NONE)));
 
-        auto modes = mHwc.getModes(info->id);
+        auto modes = mHwc.getModes(info->id, kMaxFrameIntervalNs);
         EXPECT_EQ(modes.size(), size_t{1});
         EXPECT_EQ(modes.front().hwcId, kConfigId);
         EXPECT_EQ(modes.front().width, kWidth);
@@ -193,7 +194,7 @@
                                         _))
                 .WillOnce(DoAll(SetArgPointee<3>(kDpi), Return(HalError::NONE)));
 
-        modes = mHwc.getModes(info->id);
+        modes = mHwc.getModes(info->id, kMaxFrameIntervalNs);
         EXPECT_EQ(modes.size(), size_t{1});
         EXPECT_EQ(modes.front().hwcId, kConfigId);
         EXPECT_EQ(modes.front().width, kWidth);
@@ -209,6 +210,7 @@
 TEST_F(HWComposerTest, getModesWithDisplayConfigurations) {
     constexpr hal::HWDisplayId kHwcDisplayId = 2;
     constexpr hal::HWConfigId kConfigId = 42;
+    constexpr int32_t kMaxFrameIntervalNs = 50000000; // 20Fps
     expectHotplugConnect(kHwcDisplayId);
     const auto info = mHwc.onHotplug(kHwcDisplayId, hal::Connection::CONNECTED);
     ASSERT_TRUE(info);
@@ -216,9 +218,9 @@
     EXPECT_CALL(*mHal, getDisplayConfigurationsSupported()).WillRepeatedly(Return(true));
 
     {
-        EXPECT_CALL(*mHal, getDisplayConfigurations(kHwcDisplayId, _))
+        EXPECT_CALL(*mHal, getDisplayConfigurations(kHwcDisplayId, _, _))
                 .WillOnce(Return(HalError::BAD_DISPLAY));
-        EXPECT_TRUE(mHwc.getModes(info->id).empty());
+        EXPECT_TRUE(mHwc.getModes(info->id, kMaxFrameIntervalNs).empty());
     }
     {
         constexpr int32_t kWidth = 480;
@@ -232,13 +234,13 @@
         displayConfiguration.width = kWidth;
         displayConfiguration.vsyncPeriod = kVsyncPeriod;
 
-        EXPECT_CALL(*mHal, getDisplayConfigurations(kHwcDisplayId, _))
-                .WillOnce(DoAll(SetArgPointee<1>(std::vector<hal::DisplayConfiguration>{
+        EXPECT_CALL(*mHal, getDisplayConfigurations(kHwcDisplayId, _, _))
+                .WillOnce(DoAll(SetArgPointee<2>(std::vector<hal::DisplayConfiguration>{
                                         displayConfiguration}),
                                 Return(HalError::NONE)));
 
         // Optional dpi not supported
-        auto modes = mHwc.getModes(info->id);
+        auto modes = mHwc.getModes(info->id, kMaxFrameIntervalNs);
         EXPECT_EQ(modes.size(), size_t{1});
         EXPECT_EQ(modes.front().hwcId, kConfigId);
         EXPECT_EQ(modes.front().width, kWidth);
@@ -252,12 +254,12 @@
         constexpr int32_t kDpi = 320;
         displayConfiguration.dpi = {kDpi, kDpi};
 
-        EXPECT_CALL(*mHal, getDisplayConfigurations(kHwcDisplayId, _))
-                .WillOnce(DoAll(SetArgPointee<1>(std::vector<hal::DisplayConfiguration>{
+        EXPECT_CALL(*mHal, getDisplayConfigurations(kHwcDisplayId, _, _))
+                .WillOnce(DoAll(SetArgPointee<2>(std::vector<hal::DisplayConfiguration>{
                                         displayConfiguration}),
                                 Return(HalError::NONE)));
 
-        modes = mHwc.getModes(info->id);
+        modes = mHwc.getModes(info->id, kMaxFrameIntervalNs);
         EXPECT_EQ(modes.size(), size_t{1});
         EXPECT_EQ(modes.front().hwcId, kConfigId);
         EXPECT_EQ(modes.front().width, kWidth);