Merge "Show FGS notifs even if app is over limit" into rvc-dev am: 14a69d9ec5 am: da3415eb66 (382afed1) · Commits · e / os / android_frameworks_base

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

+9 −7

Original line number	Diff line number	Diff line
		@@ -5960,7 +5960,8 @@ public class NotificationManagerService extends SystemService {
		}
		}

		// limit the number of outstanding notificationrecords an app can have
		// limit the number of non-fgs outstanding notificationrecords an app can have
		if (!r.getNotification().isForegroundService()) {
		int count = getNotificationCountLocked(pkg, userId, id, tag);
		if (count >= MAX_PACKAGE_NOTIFICATIONS) {
		mUsageStats.registerOverCountQuota(pkg);
		@@ -5970,6 +5971,7 @@ public class NotificationManagerService extends SystemService {
		}
		}
		}
		}

		synchronized (mNotificationLock) {
		// snoozed apps

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

+58 −0

Original line number	Diff line number	Diff line
		@@ -6652,4 +6652,62 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {

		assertFalse(mBinderService.hasSentMessage(PKG, mUid));
		}

		@Test
		public void testCanPostFgsWhenOverLimit() throws RemoteException {
		for (int i = 0; i < NotificationManagerService.MAX_PACKAGE_NOTIFICATIONS; i++) {
		StatusBarNotification sbn = generateNotificationRecord(mTestNotificationChannel,
		i, null, false).getSbn();
		mBinderService.enqueueNotificationWithTag(PKG, PKG,
		"testCanPostFgsWhenOverLimit",
		sbn.getId(), sbn.getNotification(), sbn.getUserId());
		}

		final StatusBarNotification sbn = generateNotificationRecord(null).getSbn();
		sbn.getNotification().flags \|= FLAG_FOREGROUND_SERVICE;
		mBinderService.enqueueNotificationWithTag(PKG, PKG,
		"testCanPostFgsWhenOverLimit - fgs over limit!",
		sbn.getId(), sbn.getNotification(), sbn.getUserId());

		waitForIdle();

		StatusBarNotification[] notifs =
		mBinderService.getActiveNotifications(sbn.getPackageName());
		assertEquals(NotificationManagerService.MAX_PACKAGE_NOTIFICATIONS + 1, notifs.length);
		assertEquals(NotificationManagerService.MAX_PACKAGE_NOTIFICATIONS + 1,
		mService.getNotificationRecordCount());
		}

		@Test
		public void testCannotPostNonFgsWhenOverLimit() throws RemoteException {
		for (int i = 0; i < NotificationManagerService.MAX_PACKAGE_NOTIFICATIONS; i++) {
		StatusBarNotification sbn = generateNotificationRecord(mTestNotificationChannel,
		i, null, false).getSbn();
		mBinderService.enqueueNotificationWithTag(PKG, PKG,
		"testCanPostFgsWhenOverLimit",
		sbn.getId(), sbn.getNotification(), sbn.getUserId());
		waitForIdle();
		}

		final StatusBarNotification sbn = generateNotificationRecord(mTestNotificationChannel,
		100, null, false).getSbn();
		sbn.getNotification().flags \|= FLAG_FOREGROUND_SERVICE;
		mBinderService.enqueueNotificationWithTag(PKG, PKG,
		"testCanPostFgsWhenOverLimit - fgs over limit!",
		sbn.getId(), sbn.getNotification(), sbn.getUserId());

		final StatusBarNotification sbn2 = generateNotificationRecord(mTestNotificationChannel,
		101, null, false).getSbn();
		mBinderService.enqueueNotificationWithTag(PKG, PKG,
		"testCanPostFgsWhenOverLimit - non fgs over limit!",
		sbn2.getId(), sbn2.getNotification(), sbn2.getUserId());

		waitForIdle();

		StatusBarNotification[] notifs =
		mBinderService.getActiveNotifications(sbn.getPackageName());
		assertEquals(NotificationManagerService.MAX_PACKAGE_NOTIFICATIONS + 1, notifs.length);
		assertEquals(NotificationManagerService.MAX_PACKAGE_NOTIFICATIONS + 1,
		mService.getNotificationRecordCount());
		}
		}