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

Commit d7bdfd10 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add correct flags dependency for force-grouping tests" into main

parents 79d3acbb d0847e4f

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

+4 −2
Original line number Diff line number Diff line
@@ -2815,7 +2815,8 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { 
    }















    @Test













    @EnableFlags(FLAG_NOTIFICATION_FORCE_GROUPING)













    @EnableFlags({FLAG_NOTIFICATION_FORCE_GROUPING,













            android.app.Flags.FLAG_CHECK_AUTOGROUP_BEFORE_POST})















    public void testOnlyForceGroupIfNeeded_newNotification_notAutogrouped() {















        NotificationRecord r = generateNotificationRecord(mTestNotificationChannel, 0, null, false);















        when(mGroupHelper.onNotificationPosted(any(), anyBoolean())).thenReturn(false);









@@ -2834,7 +2835,8 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {













    }





























    @Test













    @EnableFlags(FLAG_NOTIFICATION_FORCE_GROUPING)













    @EnableFlags({FLAG_NOTIFICATION_FORCE_GROUPING,













            android.app.Flags.FLAG_CHECK_AUTOGROUP_BEFORE_POST})















    public void testOnlyForceGroupIfNeeded_newNotification_wasAutogrouped() {















        NotificationRecord r = generateNotificationRecord(mTestNotificationChannel, 0, null, false);















        when(mGroupHelper.onNotificationPosted(any(), anyBoolean())).thenReturn(true);