Merge "Allow system listeners to unsnooze" (ac6a498e) · Commits · e / os / android_frameworks_base

core/java/android/app/INotificationManager.aidl

+1 −0

Original line number	Diff line number	Diff line
		@@ -162,6 +162,7 @@ interface INotificationManager
		void applyAdjustmentFromAssistant(in INotificationListener token, in Adjustment adjustment);
		void applyAdjustmentsFromAssistant(in INotificationListener token, in List<Adjustment> adjustments);
		void unsnoozeNotificationFromAssistant(in INotificationListener token, String key);
		void unsnoozeNotificationFromSystemListener(in INotificationListener token, String key);

		ComponentName getEffectsSuppressor();
		boolean matchesCallFilter(in Bundle extras);

+23 −0

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

		/**
		* Allows the notification assistant to un-snooze a single notification.
		*
		* @param token The binder for the listener, to check that the caller is allowed
		*/
		@Override
		public void unsnoozeNotificationFromSystemListener(INotificationListener token,
		String key) {
		long identity = Binder.clearCallingIdentity();
		try {
		synchronized (mNotificationLock) {
		final ManagedServiceInfo info =
		mListeners.checkServiceTokenLocked(token);
		if (!info.isSystem) {
		throw new SecurityException("Not allowed to unsnooze before deadline");
		}
		unsnoozeNotificationInt(key, info);
		}
		} finally {
		Binder.restoreCallingIdentity(identity);
		}
		}

		/**
		* Allow an INotificationListener to simulate clearing (dismissing) a single notification.
		*

+170 −228

File changed.

Preview size limit exceeded, changes collapsed.

+27 −0

Original line number	Diff line number	Diff line
		@@ -2621,6 +2621,33 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {
		verify(mSnoozeHelper, never()).repostGroupSummary(anyString(), anyInt(), anyString());
		}

		@Test
		public void testSystemNotificationListenerCanUnsnooze() throws Exception {
		final NotificationRecord nr = generateNotificationRecord(
		mTestNotificationChannel, 2, "group", false);

		mBinderService.enqueueNotificationWithTag(PKG, PKG,
		"testSystemNotificationListenerCanUnsnooze",
		nr.getSbn().getId(), nr.getSbn().getNotification(),
		nr.getSbn().getUserId());
		waitForIdle();
		NotificationManagerService.SnoozeNotificationRunnable snoozeNotificationRunnable =
		mService.new SnoozeNotificationRunnable(
		nr.getKey(), 100, null);
		snoozeNotificationRunnable.run();

		ManagedServices.ManagedServiceInfo listener = mListeners.new ManagedServiceInfo(
		null, new ComponentName(PKG, "test_class"), mUid, true, null, 0);
		listener.isSystem = true;
		when(mListeners.checkServiceTokenLocked(any())).thenReturn(listener);

		mBinderService.unsnoozeNotificationFromSystemListener(null, nr.getKey());
		waitForIdle();
		StatusBarNotification[] notifs = mBinderService.getActiveNotifications(PKG);
		assertEquals(1, notifs.length);
		assertNotNull(notifs[0].getKey());//mService.getNotificationRecord(nr.getSbn().getKey()));
		}

		@Test
		public void testSetListenerAccessForUser() throws Exception {
		UserHandle user = UserHandle.of(10);

+11 −26

File changed.

Preview size limit exceeded, changes collapsed.