Merge "Remove toast window token after being rate-limited" (edc2a14c) · Commits · e / os / android_frameworks_base

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

+3 −1

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

		int index = mToastQueue.indexOf(record);
		if (index >= 0) {
		mToastQueue.remove(index);
		ToastRecord toast = mToastQueue.remove(index);
		mWindowManagerInternal.removeWindowToken(
		toast.windowToken, true /* removeWindows */, toast.displayId);
		}
		record = (mToastQueue.size() > 0) ? mToastQueue.get(0) : null;
		}

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

+34 −0

Original line number	Diff line number	Diff line
		@@ -62,6 +62,7 @@ import static android.service.notification.NotificationListenerService.FLAG_FILT
		import static android.service.notification.NotificationListenerService.FLAG_FILTER_TYPE_ONGOING;
		import static android.service.notification.NotificationListenerService.Ranking.USER_SENTIMENT_NEGATIVE;
		import static android.service.notification.NotificationListenerService.Ranking.USER_SENTIMENT_NEUTRAL;
		import static android.view.WindowManager.LayoutParams.TYPE_TOAST;

		import static com.google.common.truth.Truth.assertThat;

		@@ -5481,6 +5482,39 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {
		verify(mStatusBar).showToast(anyInt(), any(), any(), any(), any(), anyInt(), any());
		}

		@Test
		public void testRateLimitedToasts_windowsRemoved() throws Exception {
		final String testPackage = "testPackageName";
		assertEquals(0, mService.mToastQueue.size());
		mService.isSystemUid = false;
		setToastRateIsWithinQuota(false); // rate limit reached
		setIfPackageHasPermissionToAvoidToastRateLimiting(testPackage, false);
		setAppInForegroundForToasts(mUid, false);

		// package is not suspended
		when(mPackageManager.isPackageSuspendedForUser(testPackage, UserHandle.getUserId(mUid)))
		.thenReturn(false);

		Binder token = new Binder();
		INotificationManager nmService = (INotificationManager) mService.mService;

		nmService.enqueueTextToast(testPackage, token, "Text", 2000, 0, null);

		// window token was added when enqueued
		ArgumentCaptor<Binder> binderCaptor =
		ArgumentCaptor.forClass(Binder.class);
		verify(mWindowManagerInternal).addWindowToken(binderCaptor.capture(),
		eq(TYPE_TOAST), anyInt(), eq(null));

		// but never shown
		verify(mStatusBar, times(0))
		.showToast(anyInt(), any(), any(), any(), any(), anyInt(), any());

		// and removed when rate limited
		verify(mWindowManagerInternal)
		.removeWindowToken(eq(binderCaptor.getValue()), eq(true), anyInt());
		}

		@Test
		public void backgroundSystemCustomToast_callsSetProcessImportantAsForegroundForToast() throws
		Exception {