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

Commit 2e875e3f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Use correct timeout when gating sync transaction" into tm-dev am: 5f803607 am: ce1a6451 

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



Change-Id: I8bbf8c700bd4419f9d580815962d46dd78ed793b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3a599775 ce1a6451

services/core/java/com/android/server/wm/BLASTSyncEngine.java

+4 −4
Original line number Diff line number Diff line
@@ -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);
@@ -261,7 +261,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) {
@@ -271,7 +271,7 @@ class BLASTSyncEngine { 
    }



    void startSyncSet(SyncGroup s) {

        startSyncSet(s, WindowState.BLAST_TIMEOUT_DURATION);

        startSyncSet(s, BLAST_TIMEOUT_DURATION);

    }



    void startSyncSet(SyncGroup s, long timeoutMs) {