From 73bcb5b51f49286e08d4a904b9289603a6c71842 Mon Sep 17 00:00:00 2001 From: Chloris Kuo Date: Tue, 26 Jan 2021 15:31:13 -0800 Subject: [PATCH] Conversation Blocklist Add KEY_NOT_CONVERSATION into default allowed adjustments list and add DeviceConfig to enable it Bug: 173106605, 178151392 Test: tested on device Change-Id: I9a34fc3aadadde785bfce2bdf2ff35b0cc0b0ec6 (cherry picked from commit 6fe1741d371ade332a74901f8de8709a4869f196) --- .../config/sysui/SystemUiDeviceConfigFlags.java | 5 +++++ .../notification/NotificationManagerService.java | 10 +++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/core/java/com/android/internal/config/sysui/SystemUiDeviceConfigFlags.java b/core/java/com/android/internal/config/sysui/SystemUiDeviceConfigFlags.java index 13358daf05a15..1f09489b3f1fd 100644 --- a/core/java/com/android/internal/config/sysui/SystemUiDeviceConfigFlags.java +++ b/core/java/com/android/internal/config/sysui/SystemUiDeviceConfigFlags.java @@ -62,6 +62,11 @@ public final class SystemUiDeviceConfigFlags { */ public static final String ENABLE_NAS_FEEDBACK = "enable_nas_feedback"; + /** + * Whether the Notification Assistant can label a notification not a conversation + */ + public static final String ENABLE_NAS_NOT_CONVERSATION = "enable_nas_not_conversation"; + // Flags related to screenshot intelligence /** diff --git a/services/core/java/com/android/server/notification/NotificationManagerService.java b/services/core/java/com/android/server/notification/NotificationManagerService.java index e32c00fe9a39b..90c10987c727e 100755 --- a/services/core/java/com/android/server/notification/NotificationManagerService.java +++ b/services/core/java/com/android/server/notification/NotificationManagerService.java @@ -377,7 +377,8 @@ public class NotificationManagerService extends SystemService { static final String[] DEFAULT_ALLOWED_ADJUSTMENTS = new String[] { Adjustment.KEY_CONTEXTUAL_ACTIONS, - Adjustment.KEY_TEXT_REPLIES}; + Adjustment.KEY_TEXT_REPLIES, + Adjustment.KEY_NOT_CONVERSATION}; static final String[] NON_BLOCKABLE_DEFAULT_ROLES = new String[] { RoleManager.ROLE_DIALER, @@ -2313,6 +2314,13 @@ public class NotificationManagerService extends SystemService { } else if ("false".equals(value)) { mAssistants.disallowAdjustmentType(Adjustment.KEY_RANKING_SCORE); } + } else if (SystemUiDeviceConfigFlags.ENABLE_NAS_NOT_CONVERSATION.equals(name)) { + String value = properties.getString(name, null); + if ("true".equals(value)) { + mAssistants.allowAdjustmentType(Adjustment.KEY_NOT_CONVERSATION); + } else if ("false".equals(value)) { + mAssistants.disallowAdjustmentType(Adjustment.KEY_NOT_CONVERSATION); + } } } };