commit 66500045691f28c7db0495c717b4b64440c88a33
author Julia Reynolds <juliacr@google.com> Fri Apr 19 11:23:55 2019 -0400
committer Julia Reynolds <juliacr@google.com> Fri Apr 19 16:06:45 2019 +0000
tree ae2bef2971079befdc56c00751193105a6854541
parent 3a15b6c1dfef54f41cc8938aba0a5ede6902a7dd

Disable blocking helper

By default, at least

Test: manual
Fixes: 130739518
Change-Id: Ic83c80740b2d844cad8eb97a08172b57204be8f8

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

diff --git a/services/core/java/com/android/server/notification/NotificationManagerService.java b/services/core/java/com/android/server/notification/NotificationManagerService.java
index 6c11157..2e8e65b 100644
--- a/services/core/java/com/android/server/notification/NotificationManagerService.java
+++ b/services/core/java/com/android/server/notification/NotificationManagerService.java
@@ -308,8 +308,7 @@
     static final String[] DEFAULT_ALLOWED_ADJUSTMENTS = new String[] {
             Adjustment.KEY_IMPORTANCE,
             Adjustment.KEY_CONTEXTUAL_ACTIONS,
-            Adjustment.KEY_TEXT_REPLIES,
-            Adjustment.KEY_USER_SENTIMENT};
+            Adjustment.KEY_TEXT_REPLIES};
 
     static final String[] NON_BLOCKABLE_DEFAULT_ROLES = new String[] {
             RoleManager.ROLE_DIALER,
@@ -7325,7 +7324,7 @@
 
         private static final String ATT_USER_SET = "user_set";
         // TODO: STOPSHIP (b/127994217) switch to final value when onboarding flow is implemented
-        private static final String TAG_ALLOWED_ADJUSTMENT_TYPES = "allowed_adjustments_tmp";
+        private static final String TAG_ALLOWED_ADJUSTMENT_TYPES = "allowed_adjustments_tmp2";
         private static final String ATT_TYPES = "types";
 
         private final Object mLock = new Object();