diff options
2 files changed, 6 insertions, 2 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotificationEntry.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotificationEntry.java index 4573d5989faa..cfe9fbe3af29 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotificationEntry.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotificationEntry.java @@ -748,7 +748,11 @@ public final class NotificationEntry extends ListEntry { return row != null && row.getGuts() != null && row.getGuts().isExposed(); } - public boolean isChildInGroup() { + /** + * @return Whether the notification row is a child of a group notification view; false if the + * row is null + */ + public boolean rowIsChildInGroup() { return row != null && row.isChildInGroup(); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/HeadsUpManagerPhone.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/HeadsUpManagerPhone.java index 6b4382f731ea..f4862c73606f 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/HeadsUpManagerPhone.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/HeadsUpManagerPhone.java @@ -175,7 +175,7 @@ public class HeadsUpManagerPhone extends BaseHeadsUpManager implements OnHeadsUp if (!hasPinnedHeadsUp() || topEntry == null) { return null; } else { - if (topEntry.isChildInGroup()) { + if (topEntry.rowIsChildInGroup()) { final NotificationEntry groupSummary = mGroupMembershipManager.getGroupSummary(topEntry); if (groupSummary != null) { |