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

Commit 0ff4df6c authored by Vishnu Nair's avatar Vishnu Nair Committed by Automerger Merge Worker
Browse files

Merge "Set timeouts for SurfaceSyncGroup based on HW timeout" into udc-dev am: 6e40151c 

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



Change-Id: Icd16f6ebd28c03e8e242d5a6e5e2f0d9ee135336
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5f386a14 6e40151c

core/java/android/view/ViewRootImpl.java

+2 −1
Original line number Diff line number Diff line
@@ -11626,7 +11626,8 @@ public final class ViewRootImpl implements ViewParent, 


        mNumPausedForSync++;

        mHandler.removeMessages(MSG_PAUSED_FOR_SYNC_TIMEOUT);

        mHandler.sendEmptyMessageDelayed(MSG_PAUSED_FOR_SYNC_TIMEOUT, 1000);

        mHandler.sendEmptyMessageDelayed(MSG_PAUSED_FOR_SYNC_TIMEOUT,

                1000 * Build.HW_TIMEOUT_MULTIPLIER);

        return mActiveSurfaceSyncGroup;

    };

core/java/android/window/SurfaceSyncGroup.java

+2 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.annotation.Nullable; 
import android.annotation.UiThread;

import android.os.Binder;

import android.os.BinderProxy;

import android.os.Build;

import android.os.Debug;

import android.os.Handler;

import android.os.HandlerThread;
@@ -62,7 +63,7 @@ public final class SurfaceSyncGroup { 
    private static final int MAX_COUNT = 100;



    private static final AtomicInteger sCounter = new AtomicInteger(0);

    private static final int TRANSACTION_READY_TIMEOUT = 1000;

    private static final int TRANSACTION_READY_TIMEOUT = 1000 * Build.HW_TIMEOUT_MULTIPLIER;



    private static Supplier<Transaction> sTransactionFactory = Transaction::new;