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

Merge "Remove force transition logic when keyguard is occluded." into sc-v2-dev

Browse Source
This commit is contained in:
Issei Suzuki
2021-08-31 16:01:03 +00:00
committed by Android (Google) Code Review
parent 964abd77da 0fd19013e5
commit c062a0216b
1 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -375,7 +375,7 @@ class KeyguardController {
// TODO(b/113840485): Handle app transition for individual display, and apply occluded // TODO(b/113840485): Handle app transition for individual display, and apply occluded
// state change to secondary displays. // state change to secondary displays.
// For now, only default display fully supports occluded change. Other displays only // For now, only default display fully supports occluded change. Other displays only
// updates keygaurd sleep token on that display. // updates keyguard sleep token on that display.
if (displayId != DEFAULT_DISPLAY) { if (displayId != DEFAULT_DISPLAY) {
updateKeyguardSleepToken(displayId); updateKeyguardSleepToken(displayId);
return; return;
@@ -390,15 +390,6 @@ class KeyguardController {
isDisplayOccluded(DEFAULT_DISPLAY) isDisplayOccluded(DEFAULT_DISPLAY)
? TRANSIT_KEYGUARD_OCCLUDE ? TRANSIT_KEYGUARD_OCCLUDE
: TRANSIT_KEYGUARD_UNOCCLUDE, 0 /* flags */); : TRANSIT_KEYGUARD_UNOCCLUDE, 0 /* flags */);
// When the occluding activity also turns on the display, visibility of the activity
// 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.
// TODO(b/194243906): Fix this before enabling the remote keyguard animation.
if (WindowManagerService.sEnableRemoteKeyguardGoingAwayAnimation
&& topActivity != null) {
topActivity.mRequestForceTransition = true;
}
updateKeyguardSleepToken(DEFAULT_DISPLAY); updateKeyguardSleepToken(DEFAULT_DISPLAY);
mWindowManager.executeAppTransition(); mWindowManager.executeAppTransition();
} finally { } finally {