Fixed a crash with HUNs
Bug: 21500600
Change-Id: Idf0a7be5d58bb5c666b930a0beada1e0ed2869aa
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java b/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java
index e73c593..4ae800f 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java
@@ -1655,8 +1655,13 @@
* @return Whether an animation was generated.
*/
private boolean generateRemoveAnimation(View child) {
+ if (mAddedHeadsUpChildren.contains(child)) {
+ removeChildFromHeadsUpChangeAnimations(child);
+ mAddedHeadsUpChildren.remove(child);
+ return false;
+ }
if (mIsExpanded && mAnimationsEnabled && !isChildInInvisibleGroup(child)) {
- if (!mChildrenToAddAnimated.contains(child) && !mAddedHeadsUpChildren.contains(child)) {
+ if (!mChildrenToAddAnimated.contains(child)) {
// Generate Animations
mChildrenToRemoveAnimated.add(child);
mNeedsAnimation = true;
@@ -1664,10 +1669,6 @@
} else {
mChildrenToAddAnimated.remove(child);
mFromMoreCardAdditions.remove(child);
- boolean remove = mAddedHeadsUpChildren.remove(child);
- if (remove) {
- removeChildFromHeadsUpChangeAnimations(child);
- }
return false;
}
}