Merge "Fixed a crash with notification groups" into nyc-dev am: c152dacc37 am: 5432938bf6

am: f96c5fd462

* commit 'f96c5fd46280754f7122637e2e90055105610030':
  Fixed a crash with notification groups

Change-Id: If68dd896bbc9ae65941782589391d53f3063ea3d
This commit is contained in:
Selim Cinek
2016-06-02 16:57:15 +00:00
committed by android-build-merger

View File

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