From 7000ff86969e3d0475dec9333f8d045ee07df705 Mon Sep 17 00:00:00 2001 From: chaviw Date: Wed, 20 Apr 2022 11:23:30 -0500 Subject: [PATCH] Use correct timeout when gating sync transaction The current timeout is 64ms, but was meant to be 5000ms Test: Builds Bug: 227533765 Bug: 224438403 Change-Id: I24f1206e325eacc3a30f3bb1833d5c39cd9a099b --- .../core/java/com/android/server/wm/BLASTSyncEngine.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/services/core/java/com/android/server/wm/BLASTSyncEngine.java b/services/core/java/com/android/server/wm/BLASTSyncEngine.java index 3f300bce54c4b..ee7d9a9b3f2de 100644 --- a/services/core/java/com/android/server/wm/BLASTSyncEngine.java +++ b/services/core/java/com/android/server/wm/BLASTSyncEngine.java @@ -19,7 +19,7 @@ package com.android.server.wm; import static android.os.Trace.TRACE_TAG_WINDOW_MANAGER; import static com.android.internal.protolog.ProtoLogGroup.WM_DEBUG_SYNC_ENGINE; -import static com.android.server.wm.WindowManagerService.H.WINDOW_STATE_BLAST_SYNC_TIMEOUT; +import static com.android.server.wm.WindowState.BLAST_TIMEOUT_DURATION; import android.annotation.NonNull; import android.os.Trace; @@ -173,7 +173,7 @@ class BLASTSyncEngine { } }; merged.addTransactionCommittedListener((r) -> { r.run(); }, callback::run); - mWm.mH.postDelayed(callback, WINDOW_STATE_BLAST_SYNC_TIMEOUT); + mWm.mH.postDelayed(callback, BLAST_TIMEOUT_DURATION); Trace.traceBegin(TRACE_TAG_WINDOW_MANAGER, "onTransactionReady"); mListener.onTransactionReady(mSyncId, merged); @@ -255,7 +255,7 @@ class BLASTSyncEngine { } int startSyncSet(TransactionReadyListener listener) { - return startSyncSet(listener, WindowState.BLAST_TIMEOUT_DURATION, ""); + return startSyncSet(listener, BLAST_TIMEOUT_DURATION, ""); } int startSyncSet(TransactionReadyListener listener, long timeoutMs, String name) { @@ -265,7 +265,7 @@ class BLASTSyncEngine { } void startSyncSet(SyncGroup s) { - startSyncSet(s, WindowState.BLAST_TIMEOUT_DURATION); + startSyncSet(s, BLAST_TIMEOUT_DURATION); } void startSyncSet(SyncGroup s, long timeoutMs) {