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

Commit aa3f7da3 authored by Julia Reynolds's avatar Julia Reynolds Committed by Android (Google) Code Review
Browse files

Merge "Rename field bundles_allowed -> adjustment_allowed" into main

parents a0b8693b 0beaf6f2

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

+1 −1
Original line number Diff line number Diff line
@@ -13064,7 +13064,7 @@ public class NotificationManagerService extends SystemService { 
                    NOTIFICATION_ADJUSTMENT_PREFERENCES,

                    /* optional int32 event_id = 1 */

                    NotificationPullStatsEvent.NOTIFICATION_BUNDLE_PREFERENCES_PULLED.getId(),

                    /* optional bool bundles_allowed = 2 */ bundlesAllowed,

                    /* optional bool adjustment_allowed = 2 */ bundlesAllowed,

                    /* repeated android.stats.notification.BundleTypes allowed_bundle_types = 3 */

                    allowedBundleTypes,

                    /* optional android.stats.notification.AdjustmentKey key = 4 */

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

+2 −2
Original line number Diff line number Diff line
@@ -1019,7 +1019,7 @@ public class NotificationAssistantsTest extends UiServiceTestCase { 
        assertTrue(atom.hasExtension(NotificationExtensionAtoms.notificationAdjustmentPreferences));

        NotificationAdjustmentPreferences p =

                atom.getExtension(NotificationExtensionAtoms.notificationAdjustmentPreferences);

        assertThat(p.getBundlesAllowed()).isTrue();

        assertThat(p.getAdjustmentAllowed()).isTrue();

        assertThat(p.getAllowedBundleTypes(0).getNumber())

                .isEqualTo(NotificationProtoEnums.TYPE_NEWS);

        assertThat(p.getAllowedBundleTypes(1).getNumber())
@@ -1055,7 +1055,7 @@ public class NotificationAssistantsTest extends UiServiceTestCase { 


        NotificationAdjustmentPreferences p2 = atomDisabled.getExtension(

                NotificationExtensionAtoms.notificationAdjustmentPreferences);

        assertThat(p2.getBundlesAllowed()).isFalse();

        assertThat(p2.getAdjustmentAllowed()).isFalse();

        assertThat(p2.getAllowedBundleTypes(0).getNumber())

                .isEqualTo(NotificationProtoEnums.TYPE_PROMOTION);

        assertThat(p2.getAllowedBundleTypes(1).getNumber())