Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fixed a crash with the autocancelling" into nyc-dev am: 4a4b76f6e8

Browse Source 
am: 45df222972

* commit '45df22297219fe2d3d685e5046b39d76127ec45b':
  Fixed a crash with the autocancelling

Change-Id: Ia1d1f6fac5e056878037b706122d99a491f5b5c1
This commit is contained in:
Selim Cinek
2016-05-23 19:29:34 +00:00
committed by android-build-merger
parent a11bd4cdca 45df222972
commit eca834dd8c
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationGroupManager.java
View File

@@ -215,17 +215,23 @@ public class NotificationGroupManager implements HeadsUpManager.OnHeadsUpChanged
public boolean isOnlyChildInSuppressedGroup(StatusBarNotification sbn) {
return isGroupSuppressed(sbn.getGroupKey())
&& isOnlyChildInGroup(sbn);
&& isOnlyChild(sbn);
}
public boolean isOnlyChildInGroup(StatusBarNotification sbn) {
private boolean isOnlyChild(StatusBarNotification sbn) {
return !sbn.getNotification().isGroupSummary()
&& getTotalNumberOfChildren(sbn) == 1;
}
public boolean isOnlyChildInGroup(StatusBarNotification sbn) {
return isOnlyChild(sbn) && getLogicalGroupSummary(sbn) != null;
}
private int getTotalNumberOfChildren(StatusBarNotification sbn) {
return getNumberOfIsolatedChildren(sbn.getGroupKey())
+ mGroupMap.get(sbn.getGroupKey()).children.size();
int isolatedChildren = getNumberOfIsolatedChildren(sbn.getGroupKey());
NotificationGroup group = mGroupMap.get(sbn.getGroupKey());
int realChildren = group != null ? group.children.size() : 0;
return isolatedChildren + realChildren;
}
private boolean isGroupSuppressed(String groupKey) {