Merge "Add a missing case when detecting if a toast can be added" into nyc-mr1-dev

This commit is contained in:
TreeHugger Robot
2016-09-29 17:11:47 +00:00
committed by Android (Google) Code Review

View File

@@ -697,7 +697,8 @@ class DisplayContent {
for (int i = 0; i < windowCount; i++) { for (int i = 0; i < windowCount; i++) {
WindowState window = windows.get(i); WindowState window = windows.get(i);
if (window.mAttrs.type == TYPE_TOAST && window.mOwnerUid == uid if (window.mAttrs.type == TYPE_TOAST && window.mOwnerUid == uid
&& !window.mPermanentlyHidden && !window.mAnimatingExit) { && !window.mPermanentlyHidden && !window.mAnimatingExit
&& !window.mRemoveOnExit) {
return false; return false;
} }
} }