OSDN Git Service

Fix broken transition to secure apps when relaunching
authorAdrian Roos <roosa@google.com>
Fri, 29 May 2015 22:23:18 +0000 (15:23 -0700)
committerAdrian Roos <roosa@google.com>
Fri, 29 May 2015 22:32:29 +0000 (22:32 +0000)
commitb85e1ecfdf410b6aec7b6f93e3932b0aa32fba06
tree27d2aeede9fd0ff68281f16129a9618bd1d54225
parent2e2ac33e889b76106af6c656aeca2a1ce8f1fc5d
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
services/core/java/com/android/server/policy/PhoneWindowManager.java