From 43530c99859d6eb385ba7d747d3868f4310c50a4 Mon Sep 17 00:00:00 2001 From: Jorim Jaggi Date: Thu, 18 May 2017 01:53:56 +0200 Subject: [PATCH] Fix refactoring typo Seems like when we renamed/rearranged the methods we didn't ignore mPolicyVisibility..and that's the most important part! Fixes a bug where the dock divider isn't animating when unlocking the phone. Bug: 36200726 Change-Id: I4c5e9ca7f1b6e7bf21f793e1cf39d92fe77489e8 --- services/core/java/com/android/server/wm/WindowState.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/wm/WindowState.java b/services/core/java/com/android/server/wm/WindowState.java index 344c61660e003..0266bf6b9244a 100644 --- a/services/core/java/com/android/server/wm/WindowState.java +++ b/services/core/java/com/android/server/wm/WindowState.java @@ -1306,7 +1306,7 @@ class WindowState extends WindowContainer implements WindowManagerP * otherwise. */ boolean wouldBeVisibleIfPolicyIgnored() { - return mHasSurface && mPolicyVisibility && !isParentWindowHidden() + return mHasSurface && !isParentWindowHidden() && !mAnimatingExit && !mDestroying && (!mIsWallpaper || mWallpaperVisible); }