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

Commit 67c45bb9 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... 

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

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

Change-Id: Ifb63bbfc0d8fc284098a26f5d96db242f1d2aef8
parents 02ce38c2 325f2dbb

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

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

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

                // 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;

                }

                updateKeyguardSleepToken(DEFAULT_DISPLAY);