Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use correct timeout when gating sync transaction" into tm-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2022-04-22 02:40:10 +00:00
committed by Android (Google) Code Review
parent 37893c2046 7000ff8696
commit 5f803607fe
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/wm/BLASTSyncEngine.java
View File

@@ -19,7 +19,7 @@ package com.android.server.wm;
import static android.os.Trace.TRACE_TAG_WINDOW_MANAGER; import static android.os.Trace.TRACE_TAG_WINDOW_MANAGER;
import static com.android.internal.protolog.ProtoLogGroup.WM_DEBUG_SYNC_ENGINE; 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.annotation.NonNull;
import android.os.Trace; import android.os.Trace;
@@ -173,7 +173,7 @@ class BLASTSyncEngine {
} }
}; };
merged.addTransactionCommittedListener((r) -> { r.run(); }, callback::run); 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"); Trace.traceBegin(TRACE_TAG_WINDOW_MANAGER, "onTransactionReady");
mListener.onTransactionReady(mSyncId, merged); mListener.onTransactionReady(mSyncId, merged);
@@ -255,7 +255,7 @@ class BLASTSyncEngine {
} }
int startSyncSet(TransactionReadyListener listener) { 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) { int startSyncSet(TransactionReadyListener listener, long timeoutMs, String name) {
@@ -265,7 +265,7 @@ class BLASTSyncEngine {
} }
void startSyncSet(SyncGroup s) { void startSyncSet(SyncGroup s) {
startSyncSet(s, WindowState.BLAST_TIMEOUT_DURATION); startSyncSet(s, BLAST_TIMEOUT_DURATION);
} }
void startSyncSet(SyncGroup s, long timeoutMs) { void startSyncSet(SyncGroup s, long timeoutMs) {