Merge "Do not apply stack bounds if the window is above lockscreen" into nyc-dev

2016-02-27 00:53:46 +00:00
parent bb6939e42a bcb8d82513
commit 6f9e1039d5
1 changed files with 5 additions and 0 deletions
--- a/services/core/java/com/android/server/wm/WindowStateAnimator.java
+++ b/services/core/java/com/android/server/wm/WindowStateAnimator.java
@@ -1223,6 +1223,11 @@ class WindowStateAnimator {
            return;
        }

+        final WindowState winShowWhenLocked = (WindowState) mPolicy.getWinShowWhenLockedLw();
+        if (w == winShowWhenLocked) {
+            return;
+        }
+
        final TaskStack stack = task.mStack;
        stack.getDimBounds(mTmpStackBounds);
        // When we resize we use the big surface approach, which means we can't trust the