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

Commit 7274dd44 authored by Julia Reynolds's avatar Julia Reynolds
Browse files

Summarization is off by default 

Test: manual
Fixes: 419279093
Flag: android.app.nm_summarization_ui
Flag: android.app.nm_summarization_onboarding_ui

Change-Id: I1afe746ba2a620133a3d885d7707664742a822c6
parent efc7f083

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

+16 −2
Original line number Diff line number Diff line
@@ -12243,7 +12243,9 @@ public class NotificationManagerService extends SystemService { 
        static final String TAG_ENABLED_NOTIFICATION_ASSISTANTS = "enabled_assistants";















        private static final String ATT_TYPES = "types";













        private static final String TAG_DENIED = "user_denied_adjustments";













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













                ? "denied_adjustment_keys"













                : "user_denied_adjustments";















        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";










@@ -12444,6 +12446,7 @@ public class NotificationManagerService extends SystemService {













        // Convenience method to return the effective list of denied adjustments for the given user.















        // For full users, this is just the list of denied adjustments contained in















        // mDeniedAdjustments for that user.













        // KEY_SUMMARIZATION is denied by default.















        // For profile users, this method checks additional criteria that may cause an adjustment to















        // be effectively denied for that user. In particular:















        // - if an adjustment is denied for that profile user's parent, then it is also effectively









@@ -12453,9 +12456,16 @@ public class NotificationManagerService extends SystemService {













        @GuardedBy("mLock")















        private @NonNull Set<String> deniedAdjustmentsForUser(@UserIdInt int userId) {















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













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













                if (!mDeniedAdjustments.containsKey(userId)) {













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













                }













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













            } else {















                if (mDeniedAdjustments.containsKey(userId)) {















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















                }













            }















            if (getUserProfiles().isProfileUser(userId, mContext)) {















                final @UserIdInt int parentId = getUserProfiles().getProfileParentId(userId,















                        mContext);










@@ -13156,6 +13166,10 @@ public class NotificationManagerService extends SystemService {













                    if (!TextUtils.isEmpty(keys)) {















                        userDeniedAdjustments.addAll(Arrays.asList(keys.split(",")));















                        mDeniedAdjustments.put(user, userDeniedAdjustments);













                    } else {













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













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













                        }















                    }















                }















            } else if (TAG_ENABLED_TYPES.equals(tag)) {