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

Commit ba831be6 authored by Riddle Hsu's avatar Riddle Hsu Committed by Automerger Merge Worker
Browse files

Merge "Skip syncing local window for rotation with shell transition" into tm-qpr-dev am: 4f28845c 

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



Change-Id: Ie6d445641d64a8ce9663b2208acddf5f59a55d58
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 30588979 4f28845c

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

+5 −2
Original line number Diff line number Diff line
@@ -204,8 +204,11 @@ class AsyncRotationController extends FadeAnimationController implements Consume 
        for (int i = mTargetWindowTokens.size() - 1; i >= 0; i--) {

            final WindowToken token = mTargetWindowTokens.keyAt(i);

            for (int j = token.getChildCount() - 1; j >= 0; j--) {

                // TODO(b/234585256): The consumer should be handleFinishDrawing().

                token.getChildAt(j).applyWithNextDraw(t -> {});

                // TODO(b/234585256): The consumer should be handleFinishDrawing(). And check why

                //  the local window might easily time out.

                final WindowState w = token.getChildAt(j);

                if (w.isClientLocal()) continue;

                w.applyWithNextDraw(t -> {});

            }

        }

        mIsSyncDrawRequested = true;