diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2015-08-24 20:52:21 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-24 20:52:21 +0000 |
| commit | 5d552f2cf733f39677fa4a8617e69566624b8cae (patch) | |
| tree | b21bd2e2ac82b9f3718dcb5ef0b0fd147a99c842 /services/core/java/com/android/server/wm | |
| parent | c9a110b0a873306e3219f1de17050cdaee6bc486 (diff) | |
| parent | 414985c422664c7f8d5dec5562b502907b965876 (diff) | |
| download | frameworks_base-5d552f2cf733f39677fa4a8617e69566624b8cae.zip frameworks_base-5d552f2cf733f39677fa4a8617e69566624b8cae.tar.gz frameworks_base-5d552f2cf733f39677fa4a8617e69566624b8cae.tar.bz2 | |
am 414985c4: Remove window from mWaitingForDrawn when policy hidden
* commit '414985c422664c7f8d5dec5562b502907b965876':
Remove window from mWaitingForDrawn when policy hidden
Diffstat (limited to 'services/core/java/com/android/server/wm')
| -rw-r--r-- | services/core/java/com/android/server/wm/WindowManagerService.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index 2c02967..33d4331 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -10409,8 +10409,8 @@ public class WindowManagerService extends IWindowManager.Stub ": removed=" + win.mRemoved + " visible=" + win.isVisibleLw() + " mHasSurface=" + win.mHasSurface + " drawState=" + win.mWinAnimator.mDrawState); - if (win.mRemoved || !win.mHasSurface) { - // Window has been removed; no draw will now happen, so stop waiting. + if (win.mRemoved || !win.mHasSurface || !win.mPolicyVisibility) { + // Window has been removed or hidden; no draw will now happen, so stop waiting. if (DEBUG_SCREEN_ON) Slog.w(TAG, "Aborted waiting for drawn: " + win); mWaitingForDrawn.remove(win); } else if (win.hasDrawnLw()) { |