From b85e1ecfdf410b6aec7b6f93e3932b0aa32fba06 Mon Sep 17 00:00:00 2001 From: Adrian Roos Date: Fri, 29 May 2015 15:23:18 -0700 Subject: [PATCH] Fix broken transition to secure apps when relaunching Previously, the logic for keeping occluded mode during transitions would also trigger when transitioning from the lockscreen to a SHOW_WHEN_LOCKED activity that was already on-screen, which would then prematurely clear the occluded mode and break the launch transition. With the fix, the lockscreen must already be occluded before the keep-occluded-during-transitions logic is triggered. Bug: 21525170 Change-Id: I1d9ad95b2dd0728af7986f09adb67a617cc62cb2 --- .../core/java/com/android/server/policy/PhoneWindowManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java index 671c44e8f259c..6a63aab5dfd47 100644 --- a/services/core/java/com/android/server/policy/PhoneWindowManager.java +++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java @@ -4264,7 +4264,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { // that is being hidden in an animation - keep the // keyguard hidden until the new window shows up and // we know whether to show the keyguard or not. - if (win.isAnimatingLw() && appWindow && showWhenLocked) { + if (win.isAnimatingLw() && appWindow && showWhenLocked && mKeyguardHidden) { mHideLockScreen = true; mWinShowWhenLocked = win; }