Merge "Fix always-null children on NotificationEntry" into qt-dev am: ab6d2d3152 (bc80f39f) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationEntryManager.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -355,10 +355,10 @@ public class NotificationEntryManager implements
		// a child we're keeping around for reply!
		continue;
		}
		entry.setKeepInParent(true);
		childEntry.setKeepInParent(true);
		// we need to set this state earlier as otherwise we might generate some weird
		// animations
		entry.removeRow();
		childEntry.removeRow();
		}
		}
		}

+14 −3

Original line number	Diff line number	Diff line
		@@ -122,7 +122,6 @@ public final class NotificationEntry {
		public boolean suspended;

		private NotificationEntry parent; // our parent (if we're in a group)
		private ArrayList<NotificationEntry> children = new ArrayList<NotificationEntry>();
		private ExpandableNotificationRow row; // the outer expanded view

		private int mCachedContrastColor = COLOR_INVALID;
		@@ -277,10 +276,20 @@ public final class NotificationEntry {

		@Nullable
		public List<NotificationEntry> getChildren() {
		if (children.size() <= 0) {
		if (row == null) {
		return null;
		}

		List<ExpandableNotificationRow> rowChildren = row.getNotificationChildren();
		if (rowChildren == null) {
		return null;
		}

		ArrayList<NotificationEntry> children = new ArrayList<>();
		for (ExpandableNotificationRow child : rowChildren) {
		children.add(child.getEntry());
		}

		return children;
		}

		@@ -740,7 +749,9 @@ public final class NotificationEntry {
		if (notification == null \|\| !notification.isClearable()) {
		return false;
		}
		if (children.size() > 0) {

		List<NotificationEntry> children = getChildren();
		if (children != null && children.size() > 0) {
		for (int i = 0; i < children.size(); i++) {
		NotificationEntry child = children.get(i);
		if (!child.isClearable()) {