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

Commit a4169025 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of [19048104] into tm-qpr1-release. 

Change-Id: I3f7bd4f4d338ab072437c43fc4622809cb51a1f1
parents a54f777f 4ec3d700

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

+6 −1
Original line number Diff line number Diff line
@@ -122,6 +122,7 @@ import static com.android.server.wm.SurfaceAnimator.ANIMATION_TYPE_ALL; 
import static com.android.server.wm.SurfaceAnimator.ANIMATION_TYPE_APP_TRANSITION;

import static com.android.server.wm.WindowContainer.AnimationFlags.CHILDREN;

import static com.android.server.wm.WindowContainer.AnimationFlags.TRANSITION;

import static com.android.server.wm.WindowContainer.SYNC_STATE_NONE;

import static com.android.server.wm.WindowManagerDebugConfig.DEBUG;

import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_DISPLAY;

import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_INPUT_METHOD;
@@ -2557,7 +2558,11 @@ public class WindowManagerService extends IWindowManager.Stub 


                win.mLastSeqIdSentToRelayout = win.mSyncSeqId;

                outSyncIdBundle.putInt("seqid", win.mSyncSeqId);

                // Only mark mAlreadyRequestedSync if there's an explicit sync request, and not if

                // we're syncing due to mDrawHandlers

                if (win.mSyncState != SYNC_STATE_NONE) {

                    win.mAlreadyRequestedSync = true;

                }

            } else {

                outSyncIdBundle.putInt("seqid", -1);

            }