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

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

Merge "Revert "Default summaries on for droid/nextfooders."" into main

parents 023fe00b 2a5f2bfd

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

+3 −6
Original line number Diff line number Diff line
@@ -12558,7 +12558,7 @@ public class NotificationManagerService extends SystemService { 














        private static final String ATT_TYPES = "types";















        private static final String TAG_DENIED = android.app.Flags.nmSummarizationOnboardingUi()













                ? "denied_adjustment_keys-temp"  // TODO: b/433554352 - restore tag for launch













                ? "denied_adjustment_keys"















                : "user_denied_adjustments";















        private static final String TAG_DENIED_KEY = "adjustment";















        private static final String ATT_DENIED_KEY = "key";









@@ -12567,8 +12567,7 @@ public class NotificationManagerService extends SystemService {













        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













        // TODO: b/433554352 - restore tag for launch













        private static final String TAG_SET_BY_USERS = "adjustment_pref_set_by_users-temp";













        private static final String TAG_SET_BY_USERS = "adjustment_pref_set_by_users";















        private static final String ATT_USER_LIST = "users";





























        private final Object mLock = new Object();










@@ -12800,9 +12799,7 @@ public class NotificationManagerService extends SystemService {













            Set<String> denied = new HashSet<>();















            if (android.app.Flags.nmSummarizationOnboardingUi()) {















                if (!mDeniedAdjustments.containsKey(userId)) {













                    // TODO: b/433554352 - restore denying summarization by default for launch













                    // mDeniedAdjustments.put(userId, new ArraySet<>(List.of(KEY_SUMMARIZATION)));













                    mDeniedAdjustments.put(userId, new ArraySet<>());













                    mDeniedAdjustments.put(userId, new ArraySet<>(List.of(KEY_SUMMARIZATION)));















                }















                denied.addAll(mDeniedAdjustments.get(userId));















            } else {

























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



+0
−2




























Original line number
Diff line number
Diff line








@@ -822,11 +822,9 @@ public class NotificationAssistantsTest extends UiServiceTestCase {





























        ArrayList<String> expected = new ArrayList<>(List.of(DEFAULT_ALLOWED_ADJUSTMENTS));





























        /* TODO: b/433554352 - restore when summarization is disabled by default again















        if (android.app.Flags.nmSummarizationOnboardingUi()) {















            expected.remove(KEY_SUMMARIZATION);















        }













         */































        assertThat(mAssistants.getAllowedAssistantAdjustments(mZero.id))















                .containsExactlyElementsIn(expected);