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

Merge changes from topic "jr-ranking-convo"

Browse Source 
* changes:
  Add flag for pendingintent
  Allow NLSes to see conversation information
This commit is contained in:
TreeHugger Robot
2020-10-12 19:21:44 +00:00
committed by Android (Google) Code Review
parent 83b6828015 e57d36d4fd
commit c7229847fb
4 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -44101,11 +44101,13 @@ package android.service.notification {
method public long getLastAudiblyAlertedMillis();
method public String getOverrideGroupKey();
method public int getRank();
method @Nullable public android.content.pm.ShortcutInfo getShortcutInfo();
method @NonNull public java.util.List<android.app.Notification.Action> getSmartActions();
method @NonNull public java.util.List<java.lang.CharSequence> getSmartReplies();
method public int getSuppressedVisualEffects();
method public int getUserSentiment();
method public boolean isAmbient();
method public boolean isConversation();
method public boolean isSuspended();
method public boolean matchesInterruptionFilter();
field public static final int USER_SENTIMENT_NEGATIVE = -1; // 0xffffffff

3
core/java/android/app/Notification.java
View File

@@ -2240,7 +2240,8 @@ public class Notification implements Parcelable
.setTicker(tickerText)
.setContentTitle(contentTitle)
.setContentText(contentText)
.setContentIntent(PendingIntent.getActivity(context, 0, contentIntent, 0))
.setContentIntent(PendingIntent.getActivity(
context, 0, contentIntent, PendingIntent.FLAG_MUTABLE))
.buildInto(this);
}

10
core/java/android/service/notification/NotificationListenerService.java
View File

@@ -1865,8 +1865,9 @@ public abstract class NotificationListenerService extends Service {
}
/**
* Returns whether this notification is a conversation notification.
* @hide
* Returns whether this notification is a conversation notification, and would appear
* in the conversation section of the notification shade, on devices that separate that
* type of notification.
*/
public boolean isConversation() {
return mIsConversation;
@@ -1881,7 +1882,10 @@ public abstract class NotificationListenerService extends Service {
}
/**
* @hide
* Returns the shortcut information associated with this notification, if it is a
* {@link #isConversation() conversation notification}.
* <p>This might be null even if the notification is a conversation notification, if
* the posting app hasn't opted into the full conversation feature set yet.</p>
*/
public @Nullable ShortcutInfo getShortcutInfo() {
return mShortcutInfo;

2
non-updatable-api/current.txt
View File

@@ -42235,11 +42235,13 @@ package android.service.notification {
method public long getLastAudiblyAlertedMillis();
method public String getOverrideGroupKey();
method public int getRank();
method @Nullable public android.content.pm.ShortcutInfo getShortcutInfo();
method @NonNull public java.util.List<android.app.Notification.Action> getSmartActions();
method @NonNull public java.util.List<java.lang.CharSequence> getSmartReplies();
method public int getSuppressedVisualEffects();
method public int getUserSentiment();
method public boolean isAmbient();
method public boolean isConversation();
method public boolean isSuspended();
method public boolean matchesInterruptionFilter();
field public static final int USER_SENTIMENT_NEGATIVE = -1; // 0xffffffff