Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Set textChanged for new notifications" into sc-v2-dev

Browse Source
This commit is contained in:
Mady Mellor
2021-11-17 19:07:10 +00:00
committed by Android (Google) Code Review
parent 4ad4975b28 6f5cbf7249
commit cb9b8086fe
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/notification/NotificationManagerService.java
View File

@@ -7067,7 +7067,9 @@ public class NotificationManagerService extends SystemService {
if (index < 0) {
mNotificationList.add(r);
mUsageStats.registerPostedByApp(r);
r.setInterruptive(isVisuallyInterruptive(null, r));
final boolean isInterruptive = isVisuallyInterruptive(null, r);
r.setInterruptive(isInterruptive);
r.setTextChanged(isInterruptive);
} else {
old = mNotificationList.get(index); // Potentially *changes* old
mNotificationList.set(index, r);

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

@@ -3871,6 +3871,19 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {
r.getStats().getDismissalSentiment());
}
@Test
public void testTextChangedSet_forNewNotifs() throws Exception {
NotificationRecord original = generateNotificationRecord(mTestNotificationChannel);
mService.addEnqueuedNotification(original);
NotificationManagerService.PostNotificationRunnable runnable =
mService.new PostNotificationRunnable(original.getKey());
runnable.run();
waitForIdle();
assertTrue(original.isTextChanged());
}
@Test
public void testVisuallyInterruptive_notSeen() throws Exception {
NotificationRecord original = generateNotificationRecord(mTestNotificationChannel);