diff options
| author | 2019-05-21 16:58:33 +0000 | |
|---|---|---|
| committer | 2019-05-21 16:58:33 +0000 | |
| commit | 52819a13d3a4fb01c75378ee20819b6af37e3e60 (patch) | |
| tree | 86d3787fe937c00c0497d97feade758612e3f2c9 | |
| parent | 743288a029deba1df1e0d01eca5d5db9dd855fc5 (diff) | |
| parent | 54c5fd17d8983485993ebafc60039e3cecf6d1de (diff) | |
Merge "Default automatic notification prioritization to off" into qt-dev
| -rw-r--r-- | services/core/java/com/android/server/notification/NotificationManagerService.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/notification/NotificationManagerService.java b/services/core/java/com/android/server/notification/NotificationManagerService.java index 13b4ab927c59..82bf00301499 100644 --- a/services/core/java/com/android/server/notification/NotificationManagerService.java +++ b/services/core/java/com/android/server/notification/NotificationManagerService.java @@ -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(); |