Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix logging in ExtServices for Q Beta"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-01-29 19:51:07 +00:00
committed by Android (Google) Code Review
parent a05d9b63b5 41bf871e8e
commit 7e67bb0716
2 changed files with 33 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/ExtServices/src/android/ext/services/notification/Assistant.java
View File

@@ -215,9 +215,9 @@ public class Assistant extends NotificationAssistantService {
return null;
}
NotificationEntry entry = new NotificationEntry(mPackageManager, sbn, channel);
ArrayList<Notification.Action> actions = mSmartActionsHelper.suggestActions(entry);
ArrayList<CharSequence> replies = mSmartActionsHelper.suggestReplies(entry);
return createEnqueuedNotificationAdjustment(entry, actions, replies);
SmartActionsHelper.SmartSuggestions suggestions = mSmartActionsHelper.suggest(entry);
return createEnqueuedNotificationAdjustment(
entry, suggestions.actions, suggestions.replies);
}
/** A convenience helper for creating an adjustment for an SBN. */

31
packages/ExtServices/src/android/ext/services/notification/SmartActionsHelper.java
View File

@@ -92,6 +92,23 @@ public class SmartActionsHelper {
mSettings = settings;
}
@NonNull
SmartSuggestions suggest(@NonNull NotificationEntry entry) {
// Whenever suggest() is called on a notification, its previous session is ended.
mNotificationKeyToResultIdCache.remove(entry.getSbn().getKey());
ArrayList<Notification.Action> actions = suggestActions(entry);
ArrayList<CharSequence> replies = suggestReplies(entry);
// Not logging subsequent events of this notification if we didn't generate any suggestion
// for it.
if (replies.isEmpty() && actions.isEmpty()) {
mNotificationKeyToResultIdCache.remove(entry.getSbn().getKey());
}
return new SmartSuggestions(replies, actions);
}
/**
* Adds action adjustments based on the notification contents.
*/
@@ -115,6 +132,7 @@ public class SmartActionsHelper {
messages.get(messages.size() - 1).getText(), MAX_SMART_ACTIONS);
}
@NonNull
ArrayList<CharSequence> suggestReplies(@NonNull NotificationEntry entry) {
if (!mSettings.mGenerateReplies) {
return EMPTY_REPLY_LIST;
@@ -146,7 +164,7 @@ public class SmartActionsHelper {
.collect(Collectors.toCollection(ArrayList::new));
String resultId = conversationActionsResult.getId();
if (resultId != null && !replies.isEmpty()) {
if (resultId != null) {
mNotificationKeyToResultIdCache.put(entry.getSbn().getKey(), resultId);
}
return replies;
@@ -385,4 +403,15 @@ public class SmartActionsHelper {
}
return actions;
}
static class SmartSuggestions {
public final ArrayList<CharSequence> replies;
public final ArrayList<Notification.Action> actions;
SmartSuggestions(
ArrayList<CharSequence> replies, ArrayList<Notification.Action> actions) {
this.replies = replies;
this.actions = actions;
}
}
}