Fixed a crash with autobundle grouping (c1e389da) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java

+13 −0

Original line number	Diff line number	Diff line
		@@ -618,6 +618,19 @@ public class ExpandableNotificationRow extends ActivatableNotificationView {
		return mOnKeyguard;
		}

		public void removeAllChildren() {
		List<ExpandableNotificationRow> notificationChildren
		= mChildrenContainer.getNotificationChildren();
		ArrayList<ExpandableNotificationRow> clonedList = new ArrayList<>(notificationChildren);
		for (int i = 0; i < clonedList.size(); i++) {
		ExpandableNotificationRow row = clonedList.get(i);
		mChildrenContainer.removeNotification(row);
		mHeaderUtil.restoreNotificationHeader(row);
		row.setIsChildInGroup(false, null);
		}
		onChildrenCountChanged();
		}

		public interface ExpansionLogger {
		public void logNotificationExpansion(String key, boolean userAction, boolean expanded);
		}

+3 −0

Original line number	Diff line number	Diff line
		@@ -1526,6 +1526,9 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
		// we are only transfering this notification to its parent, don't generate an animation
		mStackScroller.setChildTransferInProgress(true);
		}
		if (remove.isSummaryWithChildren()) {
		remove.removeAllChildren();
		}
		mStackScroller.removeView(remove);
		mStackScroller.setChildTransferInProgress(false);
		}