commit 4989f06937105023bdf841748dc5e4052c631d05
author Svet Ganov <svetoslavganov@google.com> Thu Sep 29 00:43:51 2016 -0700
committer gitbuildkicker <android-build@google.com> Thu Sep 29 12:31:26 2016 -0700
tree a5ea89c02ae9c4a0a06f201729dacbbef3e62aa7
parent 1602d098cebb2d7ac48c2656394cad9ef9a5c99e

Add a missing case when detecting if a toast can be added

We allow only one toast window per UID to be added at a
time. We ignore windows that run exit animation but we
should also ignore windows that should be removed after
the exit animation.

bug:31340854

Change-Id: I51c21f2c0e04341697f61e4cc107f9116254b206
(cherry picked from commit 62a40f87b3f45cbd20fea101d977153e9a933891)

services/core/java/com/android/server/wm/DisplayContent.java

diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java
index b90b8643..12399bd 100644
--- a/services/core/java/com/android/server/wm/DisplayContent.java
+++ b/services/core/java/com/android/server/wm/DisplayContent.java
@@ -697,7 +697,8 @@
         for (int i = 0; i < windowCount; i++) {
             WindowState window = windows.get(i);
             if (window.mAttrs.type == TYPE_TOAST && window.mOwnerUid == uid
-                    && !window.mPermanentlyHidden && !window.mAnimatingExit) {
+                    && !window.mPermanentlyHidden && !window.mAnimatingExit
+                    && !window.mRemoveOnExit) {
                 return false;
             }
         }