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

Commit 5fa1fe48 authored by Valentin Iftime's avatar Valentin Iftime
Browse files

Set default classification types when enabling KEY_TYPE adjustments 

 If the allowed classification types list is empty when enabling the NAS adjustments: then add the default set of classification types.

Flag: android.service.notification.notification_classification

Test: atest NotificationAssistantsTest
Test: atest NotificationAssistantServiceTest

Bug: 380291070
Change-Id: Ib03622604542c8e77389a1baaf0a866211fa40d1
parent 310f7b88

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

+13 −0
Original line number Diff line number Diff line
@@ -12660,6 +12660,16 @@ public class NotificationManagerService extends SystemService { 
            return Log.isLoggable("notification_assistant", Log.VERBOSE);

        }













        private void addDefaultClassificationTypes() {













            // Add the default classification types if the list is empty













            synchronized (mLock) {













                if (mAllowedClassificationTypes.isEmpty()) {













                    mAllowedClassificationTypes.addAll(













                            List.of(DEFAULT_ALLOWED_ADJUSTMENT_KEY_TYPES));













                }













            }













        }



























        @FlaggedApi(android.service.notification.Flags.FLAG_NOTIFICATION_CLASSIFICATION)















        @GuardedBy("mNotificationLock")















        public void allowAdjustmentType(@Adjustment.Keys String key) {









@@ -12670,6 +12680,9 @@ public class NotificationManagerService extends SystemService {













            for (final ManagedServiceInfo info : NotificationAssistants.this.getServices()) {















                mHandler.post(() -> notifyCapabilitiesChanged(info));















            }













            if (KEY_TYPE.equals(key)) {













                addDefaultClassificationTypes();













            }















        }





























        @FlaggedApi(android.service.notification.Flags.FLAG_NOTIFICATION_CLASSIFICATION)

























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



+28
−0




























Original line number
Diff line number
Diff line








@@ -680,6 +680,34 @@ public class NotificationAssistantsTest extends UiServiceTestCase {













                .contains(Adjustment.KEY_RANKING_SCORE);















    }





























    @Test













    @EnableFlags(android.service.notification.Flags.FLAG_NOTIFICATION_CLASSIFICATION)













    public void testAllowAdjustmentType_classifListEmpty_resetDefaultClassificationTypes() {













        mAssistants.setAssistantAdjustmentKeyTypeState(TYPE_PROMOTION, false);













        mAssistants.setAssistantAdjustmentKeyTypeState(TYPE_NEWS, false);













        mAssistants.setAssistantAdjustmentKeyTypeState(TYPE_SOCIAL_MEDIA, false);













        mAssistants.setAssistantAdjustmentKeyTypeState(TYPE_CONTENT_RECOMMENDATION, false);













        assertThat(mAssistants.getAllowedClassificationTypes()).isEmpty();













        mAssistants.disallowAdjustmentType(Adjustment.KEY_TYPE);













        mAssistants.allowAdjustmentType(Adjustment.KEY_TYPE);













        assertThat(mAssistants.getAllowedClassificationTypes()).asList()













                .contains(TYPE_PROMOTION);













    }



























    @Test













    @EnableFlags(android.service.notification.Flags.FLAG_NOTIFICATION_CLASSIFICATION)













    public void testAllowAdjustmentType_classifListNotEmpty_doNotResetDefaultClassificationTypes() {













        mAssistants.setAssistantAdjustmentKeyTypeState(TYPE_PROMOTION, false);













        mAssistants.setAssistantAdjustmentKeyTypeState(TYPE_SOCIAL_MEDIA, false);













        mAssistants.setAssistantAdjustmentKeyTypeState(TYPE_CONTENT_RECOMMENDATION, false);













        mAssistants.setAssistantAdjustmentKeyTypeState(TYPE_NEWS, true);













        assertThat(mAssistants.getAllowedClassificationTypes()).isNotEmpty();













        mAssistants.disallowAdjustmentType(Adjustment.KEY_TYPE);













        mAssistants.allowAdjustmentType(Adjustment.KEY_TYPE);













        assertThat(mAssistants.getAllowedClassificationTypes()).asList()













            .containsExactly(TYPE_NEWS);













    }





























    @Test















    @EnableFlags(Flags.FLAG_NOTIFICATION_CLASSIFICATION_UI)















    public void testDisallowAdjustmentType_readWriteXml_entries() throws Exception {