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

Commit d7368283 authored by Issei Suzuki's avatar Issei Suzuki Committed by Automerger Merge Worker
Browse files

Merge "Fix jank when launching an activity from an occluding activity." into sc-dev am: f01d5502 

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

Change-Id: Ib4cd159f4b1e971b6ddb8cdc5e7c8c84da0dccba
parents fb94c273 f01d5502

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

+3 −1
Original line number Original line Diff line number Diff line
@@ -386,7 +386,9 @@ class KeyguardController { 
                // can be committed before KEYGUARD_OCCLUDE transition is handled.

                // can be committed before KEYGUARD_OCCLUDE transition is handled.

                // Set mRequestForceTransition flag to make sure that the app transition animation

                // Set mRequestForceTransition flag to make sure that the app transition animation

                // is applied for such case.

                // is applied for such case.

                if (topActivity != null) {

                // TODO(b/194243906): Fix this before enabling the remote keyguard animation.

                if (WindowManagerService.sEnableRemoteKeyguardGoingAwayAnimation

                        && topActivity != null) {

                    topActivity.mRequestForceTransition = true;

                    topActivity.mRequestForceTransition = true;

                }

                }

                updateKeyguardSleepToken(DEFAULT_DISPLAY);

                updateKeyguardSleepToken(DEFAULT_DISPLAY);