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

Commit 69bbfc90 authored by Julia Reynolds's avatar Julia Reynolds Committed by android-build-merger
Browse files

Merge "Merge "Default automatic notification prioritization to off" into... 

Merge "Merge "Default automatic notification prioritization to off" into qt-dev am: 52819a13 am: df3dcbbe" into qt-r1-dev-plus-aosp
am: f621f660

Change-Id: Id796ff70f4081176418de97a94f985d972dff7e9
parents f33d98b3 f621f660

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

+1 −2
Original line number Diff line number Diff line
@@ -310,7 +310,6 @@ public class NotificationManagerService extends SystemService { 
    static final boolean ENABLE_BLOCKED_TOASTS = true;



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

            Adjustment.KEY_IMPORTANCE,

            Adjustment.KEY_CONTEXTUAL_ACTIONS,

            Adjustment.KEY_TEXT_REPLIES};
@@ -7344,7 +7343,7 @@ public class NotificationManagerService extends SystemService { 
        static final String TAG_ENABLED_NOTIFICATION_ASSISTANTS = "enabled_assistants";



        private static final String ATT_USER_SET = "user_set";

        private static final String TAG_ALLOWED_ADJUSTMENT_TYPES = "allowed_adjustments";

        private static final String TAG_ALLOWED_ADJUSTMENT_TYPES = "q_allowed_adjustments";

        private static final String ATT_TYPES = "types";



        private final Object mLock = new Object();