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

am: bf11142c36

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

Change-Id: I520415e49cccc48c5d26b460aa85ec804e6d9a50
This commit is contained in:
Selim Cinek
2016-06-02 16:50:13 +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();
}
}