Remove force transition logic when keyguard is occluded.
This logic was introduced to fix the bug that calls couldn't be be picked
up when device is sleeping, but the problem is not reproducible anymore.
Bug: 182975035
Bug: 196355935
Test: Manual, and pass existing tests.
1-1. Receive phone call while the screen is off.
1-2. Check the phone activity responds to touch events.
2-1. Set lock method (e.g. PIN or pattern)
2-2. From the lockscreen, double tap power to launch camera.
2-3. Take a photo.
2-4. Tap a small preview photo image to launch the preview in full
screen. Check no jarring during the transition.
Change-Id: I87f1b00e945f7cfd42d77d8f6621e951c23468d3
diff --git a/services/core/java/com/android/server/wm/KeyguardController.java b/services/core/java/com/android/server/wm/KeyguardController.java
index 6f3edbc..4a8c36f 100644
--- a/services/core/java/com/android/server/wm/KeyguardController.java
+++ b/services/core/java/com/android/server/wm/KeyguardController.java
@@ -375,7 +375,7 @@
// TODO(b/113840485): Handle app transition for individual display, and apply occluded
// state change to secondary displays.
// 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) {
updateKeyguardSleepToken(displayId);
return;
@@ -390,15 +390,6 @@
isDisplayOccluded(DEFAULT_DISPLAY)
? TRANSIT_KEYGUARD_OCCLUDE
: 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);
mWindowManager.executeAppTransition();
} finally {
