Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0f8fde35 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Log autogroups in addition to app set groups"

parents 33e75126 0a482486

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

+1 −1
Original line number Diff line number Diff line
@@ -6652,7 +6652,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++) {

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

+2 −2
Original line number Diff line number Diff line
@@ -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();