OSDN Git Service

Don't even think about changing keyguard transit
authorJorim Jaggi <jjaggi@google.com>
Thu, 15 Jun 2017 19:10:38 +0000 (15:10 -0400)
committerJorim Jaggi <jjaggi@google.com>
Thu, 15 Jun 2017 19:53:04 +0000 (15:53 -0400)
commita69243a5475c3cecc410c3328f221bab220cab8a
tree0b2c0802130eba0258d2dd81b6dc05870c20c51c
parent38778637ade0863ae1ba7067f7f1dbb260366ce7
Don't even think about changing keyguard transit

When camera was launched with a lockscreen wallpaper set, the
wallpaper target was launcher in that case, which was also in
mClosingApps because it was first getting shown by keyguard
exit but then immediately hidden by starting the camera,
before the transition started.

Now since lockscreen wasn't the wallpaper target, launcher was
already for some reason, and we changed the transit to
WALLPAPER_CLOSE as a window with the wallpaper target was in
mClosingApps.

Fix this by never ever changing away from keyguard transits.

Test: go/wm-smoke
Test: ActivityManagerTransitionSelectionTests
Test: Set lockscreen wallpaper, set animation duration scale to
0.5, insert a random sleep statement in SystemUI, launch
camera from screen off while in trusted state and camera
wasn't running before.
Fixes: 37677242
Change-Id: I984b66d7f117034f3d55591284dd822b5ec76cbd
services/core/java/com/android/server/wm/AppTransition.java
services/core/java/com/android/server/wm/WindowSurfacePlacer.java