summaryrefslogtreecommitdiff
path: root/libs/gui/tests/EndToEndNativeInputTest.cpp
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2020-02-04 04:19:13 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2020-02-04 04:19:13 +0000
commit0400f2c9e273f5682df3bf05ebc41f36a9a84ad3 (patch)
treebfda0edb3cbb66dfcbd3fb309b6c89e2a2558cd3 /libs/gui/tests/EndToEndNativeInputTest.cpp
parentfa2c5b6a988de2c4b10c963826070ef266bc9762 (diff)
parent20a6ee25857178a120aa91a3875ad8854c0b4426 (diff)
Snap for 6179498 from 20a6ee25857178a120aa91a3875ad8854c0b4426 to rvc-release
Change-Id: I7ae356e0a21e90fe01eda5cd133761ce3d62a203
Diffstat (limited to 'libs/gui/tests/EndToEndNativeInputTest.cpp')
-rw-r--r--libs/gui/tests/EndToEndNativeInputTest.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/libs/gui/tests/EndToEndNativeInputTest.cpp b/libs/gui/tests/EndToEndNativeInputTest.cpp
index 04749e6d13..1a623e21dc 100644
--- a/libs/gui/tests/EndToEndNativeInputTest.cpp
+++ b/libs/gui/tests/EndToEndNativeInputTest.cpp
@@ -41,7 +41,7 @@
#include <input/InputTransport.h>
#include <input/Input.h>
-#include <ui/DisplayInfo.h>
+#include <ui/DisplayConfig.h>
#include <ui/Rect.h>
#include <ui/Region.h>
@@ -223,13 +223,13 @@ public:
const auto display = mComposerClient->getInternalDisplayToken();
ASSERT_NE(display, nullptr);
- DisplayInfo info;
- ASSERT_EQ(NO_ERROR, mComposerClient->getDisplayInfo(display, &info));
+ DisplayConfig config;
+ ASSERT_EQ(NO_ERROR, mComposerClient->getActiveDisplayConfig(display, &config));
// After a new buffer is queued, SurfaceFlinger is notified and will
// latch the new buffer on next vsync. Let's heuristically wait for 3
// vsyncs.
- mBufferPostDelay = int32_t(1e6 / info.fps) * 3;
+ mBufferPostDelay = static_cast<int32_t>(1e6 / config.refreshRate) * 3;
}
void TearDown() {