Merge "Fixed a crash when dumping groupmanager" into nyc-dev

2016-05-12 19:09:58 +00:00
parent 663330a325 60ca7879ec
commit 95b3120d08
1 changed files with 2 additions and 1 deletions
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationGroupManager.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationGroupManager.java
@@ -459,7 +459,8 @@ public class NotificationGroupManager implements HeadsUpManager.OnHeadsUpChanged

        @Override
        public String toString() {
-            String result = "    summary:\n      " + summary.notification;
+            String result = "    summary:\n      "
+                    + (summary != null ? summary.notification : "null");
            result += "\n    children size: " + children.size();
            for (NotificationData.Entry child : children) {
                result += "\n      " + child.notification;