commit d88b967144677b56569e194965c77d3a37979b85
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Jan 12 18:30:28 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jan 12 18:30:28 2022 +0000
tree 68bc228f474c85c1565590e0a07592165ac5b84e
parent 4f1aaa919659d9eb05b5460229e713205b3f6248
parent df084f35fc18077b4e6026e8708a64e842d611c9

Merge "composer: deflake Test_expectedPresentTime"

graphics/composer/aidl/android/hardware/graphics/composer3/vts/functional/VtsHalGraphicsComposer3_TargetTest.cpp

diff --git a/graphics/composer/aidl/android/hardware/graphics/composer3/vts/functional/VtsHalGraphicsComposer3_TargetTest.cpp b/graphics/composer/aidl/android/hardware/graphics/composer3/vts/functional/VtsHalGraphicsComposer3_TargetTest.cpp
index c61693e..5ae99a9 100644
--- a/graphics/composer/aidl/android/hardware/graphics/composer3/vts/functional/VtsHalGraphicsComposer3_TargetTest.cpp
+++ b/graphics/composer/aidl/android/hardware/graphics/composer3/vts/functional/VtsHalGraphicsComposer3_TargetTest.cpp
@@ -1426,8 +1426,7 @@
         presentFence2->waitForever(LOG_TAG);
 
         const auto actualPresentTime = presentFence2->getSignalTime();
-        const auto presentError = std::abs(expectedPresentTime - actualPresentTime);
-        EXPECT_LE(presentError, vsyncPeriod / 2);
+        EXPECT_GE(actualPresentTime, expectedPresentTime - vsyncPeriod / 2);
 
         ASSERT_TRUE(mComposerClient->setPowerMode(mPrimaryDisplay, PowerMode::OFF).isOk());
     }