Merge "Need to check current user when triggering notification lights" am:... (7200f667) · Commits · e / os / android_frameworks_base

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

+4 −0

Original line number	Diff line number	Diff line
		@@ -6873,6 +6873,10 @@ public class NotificationManagerService extends SystemService {
		if (isInCall() \|\| mScreenOn) {
		return false;
		}
		// check current user
		if (!isNotificationForCurrentUser(record)) {
		return false;
		}

		return true;
		}

+16 −0

Original line number	Diff line number	Diff line
		@@ -1345,6 +1345,22 @@ public class BuzzBeepBlinkTest extends UiServiceTestCase {
		assertEquals(-1, group.getLastAudiblyAlertedMs());
		}

		@Test
		public void testLightsCheckCurrentUser() {
		final Notification n = new Builder(getContext(), "test")
		.setSmallIcon(android.R.drawable.sym_def_app_icon).build();
		int userId = mUser.getIdentifier() + 10;
		StatusBarNotification sbn = new StatusBarNotification(mPkg, mPkg, 0, mTag, mUid,
		mPid, n, UserHandle.of(userId), null, System.currentTimeMillis());
		NotificationRecord r = new NotificationRecord(getContext(), sbn,
		new NotificationChannel("test", "test", IMPORTANCE_HIGH));

		mService.buzzBeepBlinkLocked(r);
		verifyNeverLights();
		assertFalse(r.isInterruptive());
		assertEquals(-1, r.getLastAudiblyAlertedMs());
		}

		@Test
		public void testListenerHintCall() throws Exception {
		NotificationChannel ringtoneChannel =