Merge "Refactor Archive-related bit of dumpImpl into Archive." into sc-dev (25fe902c) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/notification/NotificationManagerService.java

+18 −12

Original line number	Diff line number	Diff line
		@@ -718,6 +718,22 @@ public class NotificationManagerService extends SystemService {
		}
		}
		}

		void dumpImpl(PrintWriter pw, @NonNull DumpFilter filter) {
		synchronized (mBufferLock) {
		Iterator<Pair<StatusBarNotification, Integer>> iter = descendingIterator();
		int i = 0;
		while (iter.hasNext()) {
		final StatusBarNotification sbn = iter.next().first;
		if (filter != null && !filter.matches(sbn)) continue;
		pw.println(" " + sbn);
		if (++i >= 5) {
		if (iter.hasNext()) pw.println(" ...");
		break;
		}
		}
		}
		}
		}

		void loadDefaultApprovedServices(int userId) {
		@@ -5928,17 +5944,7 @@ public class NotificationManagerService extends SystemService {
		+ mPreferencesHelper.shouldHideSilentStatusIcons());
		}
		pw.println(" mArchive=" + mArchive.toString());
		Iterator<Pair<StatusBarNotification, Integer>> iter = mArchive.descendingIterator();
		int j=0;
		while (iter.hasNext()) {
		final StatusBarNotification sbn = iter.next().first;
		if (filter != null && !filter.matches(sbn)) continue;
		pw.println(" " + sbn);
		if (++j >= 5) {
		if (iter.hasNext()) pw.println(" ...");
		break;
		}
		}
		mArchive.dumpImpl(pw, filter);

		if (!zenOnly) {
		N = mEnqueuedNotifications.size();