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

Commit f298bdc9 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: I8045cf38b93d16ddc8980b3cf91eb43b51bf885e
parents 1e85aabe f01d5502
Loading
Loading
Loading
Loading
+3 −1
Original line number Diff line number Diff line
@@ -374,7 +374,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);