From c6f53ea93eca3baf32d725879067c774e62b345d Mon Sep 17 00:00:00 2001
From: Tony Mak <tonymak@google.com>
Date: Tue, 6 Nov 2018 20:02:08 +0000
Subject: [PATCH] Smart actions and replies feature should not be guarded by
 ... AUTO_DEMOTE_NOTIFICATIONS

Test: Found smart suggestions in notification again

BUG: 119122162
Change-Id: Iee8e559e02e91f0b3045d72f752741d53536b0c8
---
 .../android/ext/services/notification/Assistant.java | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/ExtServices/src/android/ext/services/notification/Assistant.java b/packages/ExtServices/src/android/ext/services/notification/Assistant.java
index ddc00e37b8dcb..11366848874a0 100644
--- a/packages/ExtServices/src/android/ext/services/notification/Assistant.java
+++ b/packages/ExtServices/src/android/ext/services/notification/Assistant.java
@@ -236,13 +236,13 @@ public class Assistant extends NotificationAssistantService {
             @NonNull ArrayList<CharSequence> smartReplies) {
         Bundle signals = new Bundle();
 
+        if (!smartActions.isEmpty()) {
+            signals.putParcelableArrayList(Adjustment.KEY_SMART_ACTIONS, smartActions);
+        }
+        if (!smartReplies.isEmpty()) {
+            signals.putCharSequenceArrayList(Adjustment.KEY_SMART_REPLIES, smartReplies);
+        }
         if (AUTO_DEMOTE_NOTIFICATIONS) {
-            if (!smartActions.isEmpty()) {
-                signals.putParcelableArrayList(Adjustment.KEY_SMART_ACTIONS, smartActions);
-            }
-            if (!smartReplies.isEmpty()) {
-                signals.putCharSequenceArrayList(Adjustment.KEY_SMART_REPLIES, smartReplies);
-            }
             if (mNotificationCategorizer.shouldSilence(entry)) {
                 final int importance = entry.getImportance() < IMPORTANCE_LOW
                         ? entry.getImportance() : IMPORTANCE_LOW;