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

Commit 2c519e12 authored by Patrick Williams's avatar Patrick Williams Committed by Automerger Merge Worker
Browse files

Merge "Update WindowInfosListenerUtils to use 5s timeout" into udc-qpr-dev am:...

Merge "Update WindowInfosListenerUtils to use 5s timeout" into udc-qpr-dev am: 92ef1fe6 am: ff3ebb32

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/24795252



Change-Id: I8100e04c407c6d03c1ba2ea39238a21c2e9e68fc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4a189952 ff3ebb32
Loading
Loading
Loading
Loading
+5 −2
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@
 * limitations under the License.
 */

#include <android-base/properties.h>
#include <gtest/gtest.h>
#include <gui/SurfaceComposerClient.h>
#include <private/android_filesystem_config.h>
@@ -21,7 +22,8 @@
#include <future>

namespace android {
using Transaction = SurfaceComposerClient::Transaction;

using base::HwTimeoutMultiplier;
using gui::DisplayInfo;
using gui::WindowInfo;

@@ -36,7 +38,8 @@ public:
        auto listener = sp<WindowInfosListener>::make(std::move(predicate), promise);
        mClient->addWindowInfosListener(listener);
        auto future = promise.get_future();
        bool satisfied = future.wait_for(std::chrono::seconds{1}) == std::future_status::ready;
        bool satisfied = future.wait_for(std::chrono::seconds{5 * HwTimeoutMultiplier()}) ==
                std::future_status::ready;
        mClient->removeWindowInfosListener(listener);
        return satisfied;
    }