Merge "Add missing userId arg" into tm-dev (b0ff7c86) · Commits · e / os / android_frameworks_base

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -775,7 +775,7 @@ public class NotificationManagerService extends SystemService {

		ArraySet<String> defaultDnds = mConditionProviders.getDefaultPackages();
		for (int i = 0; i < defaultDnds.size(); i++) {
		allowDndPackage(defaultDnds.valueAt(i));
		allowDndPackage(userId, defaultDnds.valueAt(i));
		}

		setDefaultAssistantForUser(userId);
		@@ -875,9 +875,9 @@ public class NotificationManagerService extends SystemService {
		}
		}

		private void allowDndPackage(String packageName) {
		private void allowDndPackage(int userId, String packageName) {
		try {
		getBinderService().setNotificationPolicyAccessGranted(packageName, true);
		getBinderService().setNotificationPolicyAccessGrantedForUser(packageName, userId, true);
		} catch (RemoteException e) {
		e.printStackTrace();
		}

+2 −0

Original line number	Diff line number	Diff line
		@@ -478,6 +478,7 @@ public final class NotificationRecord {
		pw.println(prefix + "opPkg=" + getSbn().getOpPkg());
		pw.println(prefix + "icon=" + notification.getSmallIcon());
		pw.println(prefix + "flags=0x" + Integer.toHexString(notification.flags));
		pw.println(prefix + "originalFlags=0x" + Integer.toHexString(mOriginalFlags));
		pw.println(prefix + "pri=" + notification.priority);
		pw.println(prefix + "key=" + getSbn().getKey());
		pw.println(prefix + "seen=" + mStats.hasSeen());
		@@ -544,6 +545,7 @@ public final class NotificationRecord {
		if (notification == null) {
		pw.println(prefix + "None");
		return;

		}
		pw.println(prefix + "fullscreenIntent=" + notification.fullScreenIntent);
		pw.println(prefix + "contentIntent=" + notification.contentIntent);