Merge "Make NLS.requestInterruptionFilter() use implicit rules" into main (dc176053) · Commits · e / os / android_frameworks_base

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

+37 −13

Original line number	Diff line number	Diff line
		@@ -69,6 +69,7 @@ import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_SCREEN_OF
		import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_SCREEN_ON;
		import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_STATUS_BAR;
		import static android.app.Flags.lifetimeExtensionRefactor;
		import static android.app.NotificationManager.zenModeFromInterruptionFilter;
		import static android.app.StatusBarManager.ACTION_KEYGUARD_PRIVATE_NOTIFICATIONS_CHANGED;
		import static android.app.StatusBarManager.EXTRA_KM_PRIVATE_NOTIFS_ALLOWED;
		import static android.content.Context.BIND_ALLOW_WHITELIST_MANAGEMENT;
		@@ -5311,6 +5312,28 @@ public class NotificationManagerService extends SystemService {
		@Override
		public void requestInterruptionFilterFromListener(INotificationListener token,
		int interruptionFilter) throws RemoteException {
		if (android.app.Flags.modesApi()) {
		final int callingUid = Binder.getCallingUid();
		ManagedServiceInfo info;
		synchronized (mNotificationLock) {
		info = mListeners.checkServiceTokenLocked(token);
		}

		final int zenMode = zenModeFromInterruptionFilter(interruptionFilter, -1);
		if (zenMode == -1) return;
		if (!canManageGlobalZenPolicy(info.component.getPackageName(), callingUid)) {
		mZenModeHelper.applyGlobalZenModeAsImplicitZenRule(
		info.component.getPackageName(), callingUid, zenMode);
		} else {
		int origin = computeZenOrigin(/* fromUser= */ false);
		Binder.withCleanCallingIdentity(() -> {
		mZenModeHelper.setManualZenMode(zenMode, /* conditionId= */ null, origin,
		"listener:" + info.component.flattenToShortString(),
		/* caller= */ info.component.getPackageName(),
		callingUid);
		});
		}
		} else {
		final int callingUid = Binder.getCallingUid();
		final boolean isSystemOrSystemUi = isCallerSystemOrSystemUi();
		final long identity = Binder.clearCallingIdentity();
		@@ -5325,6 +5348,7 @@ public class NotificationManagerService extends SystemService {
		Binder.restoreCallingIdentity(identity);
		}
		}
		}

		@Override
		public int getInterruptionFilterFromListener(INotificationListener token)
		@@ -5358,10 +5382,10 @@ public class NotificationManagerService extends SystemService {
		@Override
		public void setZenMode(int mode, Uri conditionId, String reason, boolean fromUser) {
		enforceSystemOrSystemUI("INotificationManager.setZenMode");
		final int callingUid = Binder.getCallingUid();
		final long identity = Binder.clearCallingIdentity();
		enforceUserOriginOnlyFromSystem(fromUser, "setZenMode");

		final int callingUid = Binder.getCallingUid();
		final long identity = Binder.clearCallingIdentity();
		try {
		mZenModeHelper.setManualZenMode(mode, conditionId, computeZenOrigin(fromUser),
		reason, /* caller= */ null, callingUid);
		@@ -5554,7 +5578,7 @@ public class NotificationManagerService extends SystemService {
		@Override
		public void setInterruptionFilter(String pkg, int filter, boolean fromUser) {
		enforcePolicyAccess(pkg, "setInterruptionFilter");
		final int zen = NotificationManager.zenModeFromInterruptionFilter(filter, -1);
		final int zen = zenModeFromInterruptionFilter(filter, -1);
		if (zen == -1) throw new IllegalArgumentException("Invalid filter: " + filter);
		final int callingUid = Binder.getCallingUid();
		enforceUserOriginOnlyFromSystem(fromUser, "setInterruptionFilter");

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -359,6 +359,7 @@ public class ZenModeHelper {
		return NotificationManager.zenModeToInterruptionFilter(mZenMode);
		}

		// TODO: b/310620812 - Remove when MODES_API is inlined (no more callers).
		public void requestFromListener(ComponentName name, int filter, int callingUid,
		boolean fromSystemOrSystemUi) {
		final int newZen = NotificationManager.zenModeFromInterruptionFilter(filter, -1);

services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java

+53 −0

Original line number	Diff line number	Diff line
		@@ -224,6 +224,7 @@ import android.os.UserHandle;
		import android.os.UserManager;
		import android.os.WorkSource;
		import android.permission.PermissionManager;
		import android.platform.test.annotations.DisableFlags;
		import android.platform.test.annotations.EnableFlags;
		import android.platform.test.flag.junit.SetFlagsRule;
		import android.platform.test.rule.DeniedDevices;
		@@ -13976,6 +13977,58 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {
		}
		}

		@Test
		@EnableFlags(android.app.Flags.FLAG_MODES_API)
		public void requestInterruptionFilterFromListener_fromApp_doesNotSetGlobalZen()
		throws Exception {
		mService.setCallerIsNormalPackage();
		mService.mZenModeHelper = mock(ZenModeHelper.class);
		ManagedServices.ManagedServiceInfo info = mock(ManagedServices.ManagedServiceInfo.class);
		when(mListeners.checkServiceTokenLocked(any())).thenReturn(info);
		info.component = new ComponentName("pkg", "cls");

		mBinderService.requestInterruptionFilterFromListener(mock(INotificationListener.class),
		INTERRUPTION_FILTER_PRIORITY);

		verify(mService.mZenModeHelper).applyGlobalZenModeAsImplicitZenRule(eq("pkg"), eq(mUid),
		eq(ZEN_MODE_IMPORTANT_INTERRUPTIONS));
		}

		@Test
		@EnableFlags(android.app.Flags.FLAG_MODES_API)
		public void requestInterruptionFilterFromListener_fromSystem_setsGlobalZen()
		throws Exception {
		mService.isSystemUid = true;
		mService.mZenModeHelper = mock(ZenModeHelper.class);
		ManagedServices.ManagedServiceInfo info = mock(ManagedServices.ManagedServiceInfo.class);
		when(mListeners.checkServiceTokenLocked(any())).thenReturn(info);
		info.component = new ComponentName("pkg", "cls");

		mBinderService.requestInterruptionFilterFromListener(mock(INotificationListener.class),
		INTERRUPTION_FILTER_PRIORITY);

		verify(mService.mZenModeHelper).setManualZenMode(eq(ZEN_MODE_IMPORTANT_INTERRUPTIONS),
		eq(null), eq(ZenModeConfig.UPDATE_ORIGIN_SYSTEM_OR_SYSTEMUI), anyString(),
		eq("pkg"), eq(mUid));
		}

		@Test
		@DisableFlags(android.app.Flags.FLAG_MODES_API)
		public void requestInterruptionFilterFromListener_flagOff_callsRequestFromListener()
		throws Exception {
		mService.setCallerIsNormalPackage();
		mService.mZenModeHelper = mock(ZenModeHelper.class);
		ManagedServices.ManagedServiceInfo info = mock(ManagedServices.ManagedServiceInfo.class);
		when(mListeners.checkServiceTokenLocked(any())).thenReturn(info);
		info.component = new ComponentName("pkg", "cls");

		mBinderService.requestInterruptionFilterFromListener(mock(INotificationListener.class),
		INTERRUPTION_FILTER_PRIORITY);

		verify(mService.mZenModeHelper).requestFromListener(eq(info.component),
		eq(INTERRUPTION_FILTER_PRIORITY), eq(mUid), /* fromSystemOrSystemUi= */ eq(false));
		}

		@Test
		@EnableFlags(android.app.Flags.FLAG_MODES_API)
		@EnableCompatChanges(NotificationManagerService.MANAGE_GLOBAL_ZEN_VIA_IMPLICIT_RULES)