Merge "Fixed a crash with notification groups" into nyc-dev

This commit is contained in:
TreeHugger Robot
2016-06-02 15:41:08 +00:00
committed by Android (Google) Code Review

View File

@@ -1097,7 +1097,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView {
mIsSystemExpanded = expand; mIsSystemExpanded = expand;
notifyHeightChanged(false /* needsAnimation */); notifyHeightChanged(false /* needsAnimation */);
logExpansionEvent(false, wasExpanded); logExpansionEvent(false, wasExpanded);
if (mChildrenContainer != null) { if (mIsSummaryWithChildren) {
mChildrenContainer.updateGroupOverflow(); mChildrenContainer.updateGroupOverflow();
} }
} }
@@ -1172,7 +1172,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView {
} }
public void updateChildrenHeaderAppearance() { public void updateChildrenHeaderAppearance() {
if (mChildrenContainer != null) { if (mIsSummaryWithChildren) {
mChildrenContainer.updateChildrenHeaderAppearance(); mChildrenContainer.updateChildrenHeaderAppearance();
} }
} }