Merge "Do not allow setting notification access across users." into tm-qpr-dev (a200a009) · Commits · e / os / android_frameworks_base

services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java

+3 −5

Original line number	Diff line number	Diff line
		@@ -620,8 +620,7 @@ public class CompanionDeviceManagerService extends SystemService {
		public PendingIntent requestNotificationAccess(ComponentName component, int userId)
		throws RemoteException {
		String callingPackage = component.getPackageName();
		checkCanCallNotificationApi(callingPackage);
		// TODO: check userId.
		checkCanCallNotificationApi(callingPackage, userId);
		if (component.flattenToString().length() > MAX_CN_LENGTH) {
		throw new IllegalArgumentException("Component name is too long.");
		}
		@@ -647,7 +646,7 @@ public class CompanionDeviceManagerService extends SystemService {
		@Deprecated
		@Override
		public boolean hasNotificationAccess(ComponentName component) throws RemoteException {
		checkCanCallNotificationApi(component.getPackageName());
		checkCanCallNotificationApi(component.getPackageName(), getCallingUserId());
		NotificationManager nm = getContext().getSystemService(NotificationManager.class);
		return nm.isNotificationListenerAccessGranted(component);
		}
		@@ -804,8 +803,7 @@ public class CompanionDeviceManagerService extends SystemService {
		legacyCreateAssociation(userId, macAddress, packageName, null);
		}

		private void checkCanCallNotificationApi(String callingPackage) {
		final int userId = getCallingUserId();
		private void checkCanCallNotificationApi(String callingPackage, int userId) {
		enforceCallerIsSystemOr(userId, callingPackage);

		if (getCallingUid() == SYSTEM_UID) return;