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

Commit 6e40151c authored by Vishnu Nair's avatar Vishnu Nair Committed by Android (Google) Code Review
Browse files

Merge "Set timeouts for SurfaceSyncGroup based on HW timeout" into udc-dev

parents d653627d 9d28de67

core/java/android/view/ViewRootImpl.java

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




        mNumPausedForSync++;

        mNumPausedForSync++;

        mHandler.removeMessages(MSG_PAUSED_FOR_SYNC_TIMEOUT);

        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;

        return mActiveSurfaceSyncGroup;

    };

    };

core/java/android/window/SurfaceSyncGroup.java

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

import android.annotation.UiThread;

import android.os.Binder;

import android.os.Binder;

import android.os.BinderProxy;

import android.os.BinderProxy;

import android.os.Build;

import android.os.Debug;

import android.os.Debug;

import android.os.Handler;

import android.os.Handler;

import android.os.HandlerThread;

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

    private static final int MAX_COUNT = 100;





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

    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;

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