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

Commit 1d8b1cd1 authored by Julia Reynolds's avatar Julia Reynolds
Browse files

Update classifier defaults 

Test: NotificationAssistantsTest
Flag: android.app.notification_classification_ui
Fixes: 430071771
Change-Id: I011e10c78780709c3d824d09ffa446443dbba467
parent 320767f0

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

+2 −4
Original line number Diff line number Diff line
@@ -523,9 +523,7 @@ public class NotificationManagerService extends SystemService { 














    static final Integer[] DEFAULT_ALLOWED_ADJUSTMENT_KEY_TYPES = new Integer[] {















            TYPE_PROMOTION,













            TYPE_NEWS,













            TYPE_CONTENT_RECOMMENDATION,













            TYPE_SOCIAL_MEDIA













            TYPE_NEWS















    };





























    static final String[] NON_BLOCKABLE_DEFAULT_ROLES = new String[] {










@@ -12542,7 +12540,7 @@ public class NotificationManagerService extends SystemService {













        private static final String TAG_DENIED_KEY = "adjustment";















        private static final String ATT_DENIED_KEY = "key";















        private static final String ATT_DENIED_KEY_APPS = "denied_apps";













        private static final String TAG_ENABLED_TYPES = "enabled_classification_types";













        private static final String TAG_ENABLED_TYPES = "enabled_bundle_types";















        private static final String ATT_NAS_UNSUPPORTED = "unsupported_adjustments";















        private static final String ATT_USER_ID = "user";















        // for classification only, but named a bit more generally in case this ever gets expanded

























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



+1
−2




























Original line number
Diff line number
Diff line








@@ -894,8 +894,7 @@ public class NotificationAssistantsTest extends UiServiceTestCase {













        writeXmlAndReload(USER_ALL);































        assertThat(mAssistants.getAllowedClassificationTypes(mZero.id)).asList()













                .containsExactlyElementsIn(List.of(TYPE_PROMOTION, TYPE_NEWS, TYPE_SOCIAL_MEDIA,













                        TYPE_CONTENT_RECOMMENDATION));













                .containsExactlyElementsIn(List.of(TYPE_PROMOTION, TYPE_NEWS));















    }































    @Test