diff options
| -rw-r--r-- | services/core/java/com/android/server/notification/NotificationManagerService.java | 4 | ||||
| -rw-r--r-- | services/core/java/com/android/server/notification/NotificationRecord.java | 14 |
2 files changed, 10 insertions, 8 deletions
diff --git a/services/core/java/com/android/server/notification/NotificationManagerService.java b/services/core/java/com/android/server/notification/NotificationManagerService.java index 95198a316d47..c337c573ffb4 100644 --- a/services/core/java/com/android/server/notification/NotificationManagerService.java +++ b/services/core/java/com/android/server/notification/NotificationManagerService.java @@ -2307,7 +2307,7 @@ public class NotificationManagerService extends SystemService { synchronized (mNotificationList) { final StatusBarNotification n = r.sbn; - Slog.d(TAG, "EnqueueNotificationRunnable.run for: " + n.getKey()); + if (DBG) Slog.d(TAG, "EnqueueNotificationRunnable.run for: " + n.getKey()); NotificationRecord old = mNotificationsByKey.get(n.getKey()); if (old != null) { // Retain ranking information from previous record @@ -2328,7 +2328,7 @@ public class NotificationManagerService extends SystemService { handleGroupedNotificationLocked(r, old, callingUid, callingPid); boolean ignoreNotification = removeUnusedGroupedNotificationLocked(r, old, callingUid, callingPid); - Slog.d(TAG, "ignoreNotification is " + ignoreNotification); + if (DBG) Slog.d(TAG, "ignoreNotification is " + ignoreNotification); // This conditional is a dirty hack to limit the logging done on // behalf of the download manager without affecting other apps. diff --git a/services/core/java/com/android/server/notification/NotificationRecord.java b/services/core/java/com/android/server/notification/NotificationRecord.java index 25d17f60a054..6c5685df503d 100644 --- a/services/core/java/com/android/server/notification/NotificationRecord.java +++ b/services/core/java/com/android/server/notification/NotificationRecord.java @@ -227,12 +227,14 @@ public final class NotificationRecord { final int N = notification.actions.length; for (int i=0; i<N; i++) { final Notification.Action action = notification.actions[i]; - pw.println(String.format("%s [%d] \"%s\" -> %s", - prefix, - i, - action.title, - action.actionIntent.toString() - )); + if (action != null) { + pw.println(String.format("%s [%d] \"%s\" -> %s", + prefix, + i, + action.title, + action.actionIntent == null ? "null" : action.actionIntent.toString() + )); + } } pw.println(prefix + " }"); } |