Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I2f2e88e8d0bb4809aedff852cdedf8f86200ddcb
This commit is contained in:
Issei Suzuki
2021-08-05 15:50:24 +00:00
committed by Automerger Merge Worker
parent 3b7601e838 f298bdc906
commit 2439536c35
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/wm/KeyguardController.java
View File

@@ -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);