Merge "Remove @SystemAPI from NotificationAssistantService" (e56b5518) · Commits · e / os / android_frameworks_base

api/current.txt

+68 −0

Original line number	Diff line number	Diff line
		@@ -5793,6 +5793,7 @@ package android.app {
		method public java.util.List<android.app.NotificationChannel> getNotificationChannels();
		method @Nullable public String getNotificationDelegate();
		method public android.app.NotificationManager.Policy getNotificationPolicy();
		method public boolean isNotificationAssistantAccessGranted(android.content.ComponentName);
		method public boolean isNotificationListenerAccessGranted(android.content.ComponentName);
		method public boolean isNotificationPolicyAccessGranted();
		method public void notify(int, android.app.Notification);
		@@ -41381,6 +41382,22 @@ package android.service.media {

		package android.service.notification {

		public final class Adjustment implements android.os.Parcelable {
		ctor public Adjustment(String, String, android.os.Bundle, CharSequence, int);
		method public int describeContents();
		method public CharSequence getExplanation();
		method public String getKey();
		method public String getPackage();
		method public android.os.Bundle getSignals();
		method public int getUser();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.service.notification.Adjustment> CREATOR;
		field public static final String KEY_IMPORTANCE = "key_importance";
		field public static final String KEY_SMART_ACTIONS = "key_smart_actions";
		field public static final String KEY_SMART_REPLIES = "key_smart_replies";
		field public static final String KEY_USER_SENTIMENT = "key_user_sentiment";
		}

		public final class Condition implements android.os.Parcelable {
		ctor public Condition(android.net.Uri, String, int);
		ctor public Condition(android.net.Uri, String, String, String, int, int, int);
		@@ -41427,6 +41444,24 @@ package android.service.notification {
		field @Deprecated public static final String SERVICE_INTERFACE = "android.service.notification.ConditionProviderService";
		}

		public abstract class NotificationAssistantService extends android.service.notification.NotificationListenerService {
		ctor public NotificationAssistantService();
		method public final void adjustNotification(android.service.notification.Adjustment);
		method public final void adjustNotifications(java.util.List<android.service.notification.Adjustment>);
		method public void onActionInvoked(@NonNull String, @NonNull android.app.Notification.Action, int);
		method public final android.os.IBinder onBind(android.content.Intent);
		method public void onNotificationDirectReplied(@NonNull String);
		method public android.service.notification.Adjustment onNotificationEnqueued(android.service.notification.StatusBarNotification);
		method public android.service.notification.Adjustment onNotificationEnqueued(android.service.notification.StatusBarNotification, android.app.NotificationChannel);
		method public void onNotificationExpansionChanged(@NonNull String, boolean, boolean);
		method public void onNotificationRemoved(android.service.notification.StatusBarNotification, android.service.notification.NotificationListenerService.RankingMap, android.service.notification.NotificationStats, int);
		method public void onNotificationsSeen(java.util.List<java.lang.String>);
		method public void onSuggestedReplySent(@NonNull String, @NonNull CharSequence, int);
		field public static final String SERVICE_INTERFACE = "android.service.notification.NotificationAssistantService";
		field public static final int SOURCE_FROM_APP = 0; // 0x0
		field public static final int SOURCE_FROM_ASSISTANT = 1; // 0x1
		}

		public abstract class NotificationListenerService extends android.app.Service {
		ctor public NotificationListenerService();
		method public final void cancelAllNotifications();
		@@ -41507,6 +41542,8 @@ package android.service.notification {
		method public long getLastAudiblyAlertedMillis();
		method public String getOverrideGroupKey();
		method public int getRank();
		method public java.util.List<android.app.Notification.Action> getSmartActions();
		method public java.util.List<java.lang.CharSequence> getSmartReplies();
		method public int getSuppressedVisualEffects();
		method public int getUserSentiment();
		method public boolean isAmbient();
		@@ -41525,6 +41562,37 @@ package android.service.notification {
		field public static final android.os.Parcelable.Creator<android.service.notification.NotificationListenerService.RankingMap> CREATOR;
		}

		public final class NotificationStats implements android.os.Parcelable {
		ctor public NotificationStats();
		method public int describeContents();
		method public int getDismissalSentiment();
		method public int getDismissalSurface();
		method public boolean hasDirectReplied();
		method public boolean hasExpanded();
		method public boolean hasInteracted();
		method public boolean hasSeen();
		method public boolean hasSnoozed();
		method public boolean hasViewedSettings();
		method public void setDirectReplied();
		method public void setDismissalSentiment(int);
		method public void setDismissalSurface(int);
		method public void setExpanded();
		method public void setSeen();
		method public void setSnoozed();
		method public void setViewedSettings();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.service.notification.NotificationStats> CREATOR;
		field public static final int DISMISSAL_AOD = 2; // 0x2
		field public static final int DISMISSAL_NOT_DISMISSED = -1; // 0xffffffff
		field public static final int DISMISSAL_OTHER = 0; // 0x0
		field public static final int DISMISSAL_PEEK = 1; // 0x1
		field public static final int DISMISSAL_SHADE = 3; // 0x3
		field public static final int DISMISS_SENTIMENT_NEGATIVE = 0; // 0x0
		field public static final int DISMISS_SENTIMENT_NEUTRAL = 1; // 0x1
		field public static final int DISMISS_SENTIMENT_POSITIVE = 2; // 0x2
		field public static final int DISMISS_SENTIMENT_UNKNOWN = -1000; // 0xfffffc18
		}

		public class StatusBarNotification implements android.os.Parcelable {
		ctor @Deprecated public StatusBarNotification(String, String, int, String, int, int, int, android.app.Notification, android.os.UserHandle, long);
		ctor public StatusBarNotification(android.os.Parcel);

api/system-current.txt

+0 −71

Original line number	Diff line number	Diff line
		@@ -6344,77 +6344,6 @@ package android.service.euicc {

		package android.service.notification {

		public final class Adjustment implements android.os.Parcelable {
		ctor public Adjustment(String, String, android.os.Bundle, CharSequence, int);
		ctor protected Adjustment(android.os.Parcel);
		method public int describeContents();
		method public CharSequence getExplanation();
		method public String getKey();
		method public String getPackage();
		method public android.os.Bundle getSignals();
		method public int getUser();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.service.notification.Adjustment> CREATOR;
		field public static final String KEY_IMPORTANCE = "key_importance";
		field public static final String KEY_PEOPLE = "key_people";
		field public static final String KEY_SMART_ACTIONS = "key_smart_actions";
		field public static final String KEY_SMART_REPLIES = "key_smart_replies";
		field public static final String KEY_SNOOZE_CRITERIA = "key_snooze_criteria";
		field public static final String KEY_USER_SENTIMENT = "key_user_sentiment";
		}

		public abstract class NotificationAssistantService extends android.service.notification.NotificationListenerService {
		ctor public NotificationAssistantService();
		method public final void adjustNotification(android.service.notification.Adjustment);
		method public final void adjustNotifications(java.util.List<android.service.notification.Adjustment>);
		method public void onActionInvoked(@NonNull String, @NonNull android.app.Notification.Action, int);
		method public final android.os.IBinder onBind(android.content.Intent);
		method public void onNotificationDirectReplied(@NonNull String);
		method public android.service.notification.Adjustment onNotificationEnqueued(android.service.notification.StatusBarNotification);
		method public android.service.notification.Adjustment onNotificationEnqueued(android.service.notification.StatusBarNotification, android.app.NotificationChannel);
		method public void onNotificationExpansionChanged(@NonNull String, boolean, boolean);
		method public void onNotificationRemoved(android.service.notification.StatusBarNotification, android.service.notification.NotificationListenerService.RankingMap, android.service.notification.NotificationStats, int);
		method public abstract void onNotificationSnoozedUntilContext(android.service.notification.StatusBarNotification, String);
		method public void onNotificationsSeen(java.util.List<java.lang.String>);
		method public void onSuggestedReplySent(@NonNull String, @NonNull CharSequence, int);
		method public final void unsnoozeNotification(String);
		field public static final String SERVICE_INTERFACE = "android.service.notification.NotificationAssistantService";
		field public static final int SOURCE_FROM_APP = 0; // 0x0
		field public static final int SOURCE_FROM_ASSISTANT = 1; // 0x1
		}

		public final class NotificationStats implements android.os.Parcelable {
		ctor public NotificationStats();
		ctor protected NotificationStats(android.os.Parcel);
		method public int describeContents();
		method public int getDismissalSentiment();
		method public int getDismissalSurface();
		method public boolean hasDirectReplied();
		method public boolean hasExpanded();
		method public boolean hasInteracted();
		method public boolean hasSeen();
		method public boolean hasSnoozed();
		method public boolean hasViewedSettings();
		method public void setDirectReplied();
		method public void setDismissalSentiment(int);
		method public void setDismissalSurface(int);
		method public void setExpanded();
		method public void setSeen();
		method public void setSnoozed();
		method public void setViewedSettings();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.service.notification.NotificationStats> CREATOR;
		field public static final int DISMISSAL_AOD = 2; // 0x2
		field public static final int DISMISSAL_NOT_DISMISSED = -1; // 0xffffffff
		field public static final int DISMISSAL_OTHER = 0; // 0x0
		field public static final int DISMISSAL_PEEK = 1; // 0x1
		field public static final int DISMISSAL_SHADE = 3; // 0x3
		field public static final int DISMISS_SENTIMENT_NEGATIVE = 0; // 0x0
		field public static final int DISMISS_SENTIMENT_NEUTRAL = 1; // 0x1
		field public static final int DISMISS_SENTIMENT_POSITIVE = 2; // 0x2
		field public static final int DISMISS_SENTIMENT_UNKNOWN = -1000; // 0xfffffc18
		}

		public final class SnoozeCriterion implements android.os.Parcelable {
		ctor public SnoozeCriterion(String, CharSequence, CharSequence);
		ctor protected SnoozeCriterion(android.os.Parcel);

api/test-current.txt

+0 −70

Original line number	Diff line number	Diff line
		@@ -1751,84 +1751,14 @@ package android.service.autofill.augmented {

		package android.service.notification {

		public final class Adjustment implements android.os.Parcelable {
		ctor public Adjustment(String, String, android.os.Bundle, CharSequence, int);
		ctor protected Adjustment(android.os.Parcel);
		method public int describeContents();
		method public CharSequence getExplanation();
		method public String getKey();
		method public String getPackage();
		method public android.os.Bundle getSignals();
		method public int getUser();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.service.notification.Adjustment> CREATOR;
		field public static final String KEY_IMPORTANCE = "key_importance";
		field public static final String KEY_PEOPLE = "key_people";
		field public static final String KEY_SMART_ACTIONS = "key_smart_actions";
		field public static final String KEY_SMART_REPLIES = "key_smart_replies";
		field public static final String KEY_SNOOZE_CRITERIA = "key_snooze_criteria";
		field public static final String KEY_USER_SENTIMENT = "key_user_sentiment";
		}

		@Deprecated public abstract class ConditionProviderService extends android.app.Service {
		method @Deprecated public boolean isBound();
		}

		public abstract class NotificationAssistantService extends android.service.notification.NotificationListenerService {
		ctor public NotificationAssistantService();
		method public final void adjustNotification(android.service.notification.Adjustment);
		method public final void adjustNotifications(java.util.List<android.service.notification.Adjustment>);
		method public void onActionInvoked(@NonNull String, @NonNull android.app.Notification.Action, int);
		method public final android.os.IBinder onBind(android.content.Intent);
		method public void onNotificationDirectReplied(@NonNull String);
		method public android.service.notification.Adjustment onNotificationEnqueued(android.service.notification.StatusBarNotification);
		method public android.service.notification.Adjustment onNotificationEnqueued(android.service.notification.StatusBarNotification, android.app.NotificationChannel);
		method public void onNotificationExpansionChanged(@NonNull String, boolean, boolean);
		method public abstract void onNotificationSnoozedUntilContext(android.service.notification.StatusBarNotification, String);
		method public void onNotificationsSeen(java.util.List<java.lang.String>);
		method public void onSuggestedReplySent(@NonNull String, @NonNull CharSequence, int);
		method public final void unsnoozeNotification(String);
		field public static final String SERVICE_INTERFACE = "android.service.notification.NotificationAssistantService";
		field public static final int SOURCE_FROM_APP = 0; // 0x0
		field public static final int SOURCE_FROM_ASSISTANT = 1; // 0x1
		}

		public abstract class NotificationListenerService extends android.app.Service {
		method public void onNotificationRemoved(android.service.notification.StatusBarNotification, android.service.notification.NotificationListenerService.RankingMap, android.service.notification.NotificationStats, int);
		}

		public final class NotificationStats implements android.os.Parcelable {
		ctor public NotificationStats();
		ctor protected NotificationStats(android.os.Parcel);
		method public int describeContents();
		method public int getDismissalSentiment();
		method public int getDismissalSurface();
		method public boolean hasDirectReplied();
		method public boolean hasExpanded();
		method public boolean hasInteracted();
		method public boolean hasSeen();
		method public boolean hasSnoozed();
		method public boolean hasViewedSettings();
		method public void setDirectReplied();
		method public void setDismissalSentiment(int);
		method public void setDismissalSurface(int);
		method public void setExpanded();
		method public void setSeen();
		method public void setSnoozed();
		method public void setViewedSettings();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.service.notification.NotificationStats> CREATOR;
		field public static final int DISMISSAL_AOD = 2; // 0x2
		field public static final int DISMISSAL_NOT_DISMISSED = -1; // 0xffffffff
		field public static final int DISMISSAL_OTHER = 0; // 0x0
		field public static final int DISMISSAL_PEEK = 1; // 0x1
		field public static final int DISMISSAL_SHADE = 3; // 0x3
		field public static final int DISMISS_SENTIMENT_NEGATIVE = 0; // 0x0
		field public static final int DISMISS_SENTIMENT_NEUTRAL = 1; // 0x1
		field public static final int DISMISS_SENTIMENT_POSITIVE = 2; // 0x2
		field public static final int DISMISS_SENTIMENT_UNKNOWN = -1000; // 0xfffffc18
		}

		public final class SnoozeCriterion implements android.os.Parcelable {
		ctor public SnoozeCriterion(String, CharSequence, CharSequence);
		ctor protected SnoozeCriterion(android.os.Parcel);

core/java/android/app/NotificationManager.java

+0 −3

Original line number	Diff line number	Diff line
		@@ -1137,9 +1137,6 @@ public class NotificationManager {
		}
		}

		/**
		* @hide
		*/
		public boolean isNotificationAssistantAccessGranted(ComponentName assistant) {
		INotificationManager service = getService();
		try {

core/java/android/service/notification/Adjustment.java

+3 −6

Original line number	Diff line number	Diff line
		@@ -15,8 +15,6 @@
		*/
		package android.service.notification;

		import android.annotation.SystemApi;
		import android.annotation.TestApi;
		import android.app.Notification;
		import android.os.Bundle;
		import android.os.Parcel;
		@@ -24,10 +22,7 @@ import android.os.Parcelable;

		/**
		* Ranking updates from the Assistant.
		* @hide
		*/
		@SystemApi
		@TestApi
		public final class Adjustment implements Parcelable {
		private final String mPackage;
		private final String mKey;
		@@ -39,6 +34,7 @@ public final class Adjustment implements Parcelable {
		* Data type: ArrayList of {@code String}, where each is a representation of a
		* {@link android.provider.ContactsContract.Contacts#CONTENT_LOOKUP_URI}.
		* See {@link android.app.Notification.Builder#addPerson(String)}.
		* @hide
		*/
		public static final String KEY_PEOPLE = "key_people";
		/**
		@@ -46,6 +42,7 @@ public final class Adjustment implements Parcelable {
		* users. If a user chooses to snooze a notification until one of these criterion, the
		* assistant will be notified via
		* {@link NotificationAssistantService#onNotificationSnoozedUntilContext}.
		* @hide
		*/
		public static final String KEY_SNOOZE_CRITERIA = "key_snooze_criteria";
		/**
		@@ -112,7 +109,7 @@ public final class Adjustment implements Parcelable {
		mUser = user;
		}

		protected Adjustment(Parcel in) {
		private Adjustment(Parcel in) {
		if (in.readInt() == 1) {
		mPackage = in.readString();
		} else {