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

am 36fc79e2: am 35a1a209: Merge "Include dnd status in bugreports." into mnc-dev

Browse Source 
* commit '36fc79e2f8f4b4e186dd7de4c646639c434f3e8b':
  Include dnd status in bugreports.
This commit is contained in:
Julia Reynolds
2015-08-04 18:41:20 +00:00
committed by Android Git Automerger
parent c62598bc58 36fc79e2f8
commit 8d45b98def
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1842,7 +1842,7 @@ public class NotificationManagerService extends SystemService {
} }
pw.println(':'); pw.println(':');
int N; int N;
final boolean zenOnly = filter != null && filter.zen; final boolean zenOnly = filter.filtered && filter.zen;
if (!zenOnly) { if (!zenOnly) {
synchronized (mToastQueue) { synchronized (mToastQueue) {
@@ -1864,13 +1864,13 @@ public class NotificationManagerService extends SystemService {
pw.println(" Notification List:"); pw.println(" Notification List:");
for (int i=0; i<N; i++) { for (int i=0; i<N; i++) {
final NotificationRecord nr = mNotificationList.get(i); final NotificationRecord nr = mNotificationList.get(i);
if (filter != null && !filter.matches(nr.sbn)) continue; if (filter.filtered && !filter.matches(nr.sbn)) continue;
nr.dump(pw, " ", getContext(), filter.redact); nr.dump(pw, " ", getContext(), filter.redact);
} }
pw.println(" "); pw.println(" ");
} }
if (filter == null) { if (!filter.filtered) {
N = mLights.size(); N = mLights.size();
if (N > 0) { if (N > 0) {
pw.println(" Lights List:"); pw.println(" Lights List:");
@@ -1911,7 +1911,7 @@ public class NotificationManagerService extends SystemService {
mUsageStats.dump(pw, " ", filter); mUsageStats.dump(pw, " ", filter);
} }
if (filter == null || zenOnly) { if (!filter.filtered || zenOnly) {
pw.println("\n Zen Mode:"); pw.println("\n Zen Mode:");
pw.print(" mInterruptionFilter="); pw.println(mInterruptionFilter); pw.print(" mInterruptionFilter="); pw.println(mInterruptionFilter);
mZenModeHelper.dump(pw, " "); mZenModeHelper.dump(pw, " ");