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

Merge "remove some logspam and fix an NPE" into nyc-dev

Browse Source 
am: f57c500e52

* commit 'f57c500e52b63187eb8f3b088792508ac4dae9ad':
  remove some logspam and fix an NPE
This commit is contained in:
Chris Wren
2016-02-25 02:20:29 +00:00
committed by android-build-merger
parent fae852a704 f57c500e52
commit 8f8baf6327
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/notification/NotificationManagerService.java
View File

@@ -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.

14
services/core/java/com/android/server/notification/NotificationRecord.java
View File

@@ -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 + " }");
}