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

Log autogroups in addition to app set groups

Browse Source 
Test: make
Bug: 165021650
Change-Id: I8cc0be1f8c0e5c01cc701a36d3e6b6b77dd4e309
This commit is contained in:
Julia Reynolds
2020-10-12 11:46:51 -04:00
parent 522b488219
commit 0a4824862d
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6644,7 +6644,7 @@ public class NotificationManagerService extends SystemService {
// Log event to statsd
mNotificationRecordLogger.maybeLogNotificationPosted(r, old, position,
buzzBeepBlinkLoggingCode, getGroupInstanceId(n.getGroupKey()));
buzzBeepBlinkLoggingCode, getGroupInstanceId(r.getSbn().getGroupKey()));
} finally {
int N = mEnqueuedNotifications.size();
for (int i = 0; i < N; i++) {

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

@@ -1883,7 +1883,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {
public void testGroupInstanceIds() throws Exception {
final NotificationRecord group1 = generateNotificationRecord(
mTestNotificationChannel, 1, "group1", true);
mBinderService.enqueueNotificationWithTag(PKG, PKG, "testFindGroupNotificationsLocked",
mBinderService.enqueueNotificationWithTag(PKG, PKG, "testGroupInstanceIds",
group1.getSbn().getId(), group1.getSbn().getNotification(),
group1.getSbn().getUserId());
waitForIdle();
@@ -1891,7 +1891,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {
// same group, child, should be returned
final NotificationRecord group1Child = generateNotificationRecord(
mTestNotificationChannel, 2, "group1", false);
mBinderService.enqueueNotificationWithTag(PKG, PKG, "testFindGroupNotificationsLocked",
mBinderService.enqueueNotificationWithTag(PKG, PKG, "testGroupInstanceIds",
group1Child.getSbn().getId(),
group1Child.getSbn().getNotification(), group1Child.getSbn().getUserId());
waitForIdle();