From cb26db087839289394897180916b86717ab42813 Mon Sep 17 00:00:00 2001
From: Jorim Jaggi <jjaggi@google.com>
Date: Thu, 25 Jun 2015 15:29:54 -0700
Subject: Don't apply existing keyguard animation to IME window

Low risk fix, but it remains unclear what the underlying cause is.

This also applies keyguard exit animation to windows on the default
display.

Bug: 21788383
Bug: 22096813
Change-Id: I37dd4b18483c1103f5f2817f4879f080a38bceca
---
 services/core/java/com/android/server/wm/WindowAnimator.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/wm/WindowAnimator.java b/services/core/java/com/android/server/wm/WindowAnimator.java
index d7b202d..76baaa7 100644
--- a/services/core/java/com/android/server/wm/WindowAnimator.java
+++ b/services/core/java/com/android/server/wm/WindowAnimator.java
@@ -343,7 +343,9 @@ public class WindowAnimator {
                         boolean applyExistingExitAnimation = mPostKeyguardExitAnimation != null
                                 && !winAnimator.mKeyguardGoingAwayAnimation
                                 && win.hasDrawnLw()
-                                && win.mAttachedWindow == null;
+                                && win.mAttachedWindow == null
+                                && !win.mIsImWindow
+                                && displayId == Display.DEFAULT_DISPLAY;
 
                         // If the window is already showing and we don't need to apply an existing
                         // Keyguard exit animation, skip.
-- 
cgit v1.1