Merge "Set mAlreadyRequestedSync only when in a BLASTSync" into tm-qpr-dev
This commit is contained in:
@@ -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.SurfaceAnimator.ANIMATION_TYPE_APP_TRANSITION;
|
||||||
import static com.android.server.wm.WindowContainer.AnimationFlags.CHILDREN;
|
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.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;
|
||||||
import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_DISPLAY;
|
import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_DISPLAY;
|
||||||
import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_INPUT_METHOD;
|
import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_INPUT_METHOD;
|
||||||
@@ -2557,7 +2558,11 @@ public class WindowManagerService extends IWindowManager.Stub
|
|||||||
|
|
||||||
win.mLastSeqIdSentToRelayout = win.mSyncSeqId;
|
win.mLastSeqIdSentToRelayout = win.mSyncSeqId;
|
||||||
outSyncIdBundle.putInt("seqid", win.mSyncSeqId);
|
outSyncIdBundle.putInt("seqid", win.mSyncSeqId);
|
||||||
win.mAlreadyRequestedSync = true;
|
// 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 {
|
} else {
|
||||||
outSyncIdBundle.putInt("seqid", -1);
|
outSyncIdBundle.putInt("seqid", -1);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user