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

Commit f621f660 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
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
parents fd2556be f59c4a3a

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();