Merge "Accept adjustments from notification assistant." (e03b8124) · Commits · e / os / android_frameworks_base

Android.mk

+3 −0

Original line number	Diff line number	Diff line
		@@ -668,6 +668,9 @@ aidl_files := \
		frameworks/base/core/java/android/view/textservice/SuggestionsInfo.aidl \
		frameworks/base/core/java/android/service/carrier/CarrierIdentifier.aidl \
		frameworks/base/core/java/android/service/carrier/MessagePdu.aidl \
		frameworks/base/core/java/android/service/notification/Adjustment.aidl \
		frameworks/base/core/java/android/service/notification/Condition.aidl \
		frameworks/base/core/java/android/service/notification/SnoozeCriterion.aidl \
		frameworks/base/core/java/android/service/notification/StatusBarNotification.aidl \
		frameworks/base/core/java/android/service/chooser/ChooserTarget.aidl \
		frameworks/base/core/java/android/speech/tts/Voice.aidl \

api/current.txt

+18 −3

Original line number	Diff line number	Diff line
		@@ -35092,18 +35092,19 @@ package android.service.media {
		package android.service.notification {

		public final class Adjustment implements android.os.Parcelable {
		ctor public Adjustment(java.lang.String, java.lang.String, int, android.os.Bundle, java.lang.CharSequence, android.net.Uri, int);
		ctor public Adjustment(java.lang.String, java.lang.String, android.os.Bundle, java.lang.CharSequence, int);
		ctor protected Adjustment(android.os.Parcel);
		method public int describeContents();
		method public java.lang.CharSequence getExplanation();
		method public int getImportance();
		method public java.lang.String getKey();
		method public java.lang.String getPackage();
		method public android.net.Uri getReference();
		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 java.lang.String KEY_CHANNEL_ID = "key_channel_id";
		field public static final java.lang.String KEY_PEOPLE = "key_people";
		field public static final java.lang.String KEY_SNOOZE_CRITERIA = "key_snooze_criteria";
		}

		public final class Condition implements android.os.Parcelable {
		@@ -35225,11 +35226,14 @@ package android.service.notification {

		public static class NotificationListenerService.Ranking {
		ctor public NotificationListenerService.Ranking();
		method public java.util.List<java.lang.String> getAdditionalPeople();
		method public android.app.NotificationChannel getChannel();
		method public int getImportance();
		method public java.lang.CharSequence getImportanceExplanation();
		method public java.lang.String getKey();
		method public java.lang.String getOverrideGroupKey();
		method public int getRank();
		method public java.util.List<android.service.notification.SnoozeCriterion> getSnoozeCriteria();
		method public int getSuppressedVisualEffects();
		method public boolean isAmbient();
		method public boolean matchesInterruptionFilter();
		@@ -35243,6 +35247,17 @@ package android.service.notification {
		field public static final android.os.Parcelable.Creator<android.service.notification.NotificationListenerService.RankingMap> CREATOR;
		}

		public final class SnoozeCriterion implements android.os.Parcelable {
		ctor public SnoozeCriterion(java.lang.String, java.lang.CharSequence, java.lang.CharSequence);
		ctor protected SnoozeCriterion(android.os.Parcel);
		method public int describeContents();
		method public java.lang.CharSequence getConfirmation();
		method public java.lang.CharSequence getExplanation();
		method public java.lang.String getId();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.service.notification.SnoozeCriterion> CREATOR;
		}

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

api/system-current.txt

+18 −3

Original line number	Diff line number	Diff line
		@@ -37924,18 +37924,19 @@ package android.service.media {
		package android.service.notification {

		public final class Adjustment implements android.os.Parcelable {
		ctor public Adjustment(java.lang.String, java.lang.String, int, android.os.Bundle, java.lang.CharSequence, android.net.Uri, int);
		ctor public Adjustment(java.lang.String, java.lang.String, android.os.Bundle, java.lang.CharSequence, int);
		ctor protected Adjustment(android.os.Parcel);
		method public int describeContents();
		method public java.lang.CharSequence getExplanation();
		method public int getImportance();
		method public java.lang.String getKey();
		method public java.lang.String getPackage();
		method public android.net.Uri getReference();
		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 java.lang.String KEY_CHANNEL_ID = "key_channel_id";
		field public static final java.lang.String KEY_PEOPLE = "key_people";
		field public static final java.lang.String KEY_SNOOZE_CRITERIA = "key_snooze_criteria";
		}

		public final class Condition implements android.os.Parcelable {
		@@ -38064,11 +38065,14 @@ package android.service.notification {

		public static class NotificationListenerService.Ranking {
		ctor public NotificationListenerService.Ranking();
		method public java.util.List<java.lang.String> getAdditionalPeople();
		method public android.app.NotificationChannel getChannel();
		method public int getImportance();
		method public java.lang.CharSequence getImportanceExplanation();
		method public java.lang.String getKey();
		method public java.lang.String getOverrideGroupKey();
		method public int getRank();
		method public java.util.List<android.service.notification.SnoozeCriterion> getSnoozeCriteria();
		method public int getSuppressedVisualEffects();
		method public boolean isAmbient();
		method public boolean matchesInterruptionFilter();
		@@ -38082,6 +38086,17 @@ package android.service.notification {
		field public static final android.os.Parcelable.Creator<android.service.notification.NotificationListenerService.RankingMap> CREATOR;
		}

		public final class SnoozeCriterion implements android.os.Parcelable {
		ctor public SnoozeCriterion(java.lang.String, java.lang.CharSequence, java.lang.CharSequence);
		ctor protected SnoozeCriterion(android.os.Parcel);
		method public int describeContents();
		method public java.lang.CharSequence getConfirmation();
		method public java.lang.CharSequence getExplanation();
		method public java.lang.String getId();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.service.notification.SnoozeCriterion> CREATOR;
		}

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

api/test-current.txt

+18 −3

Original line number	Diff line number	Diff line
		@@ -35189,18 +35189,19 @@ package android.service.media {
		package android.service.notification {

		public final class Adjustment implements android.os.Parcelable {
		ctor public Adjustment(java.lang.String, java.lang.String, int, android.os.Bundle, java.lang.CharSequence, android.net.Uri, int);
		ctor public Adjustment(java.lang.String, java.lang.String, android.os.Bundle, java.lang.CharSequence, int);
		ctor protected Adjustment(android.os.Parcel);
		method public int describeContents();
		method public java.lang.CharSequence getExplanation();
		method public int getImportance();
		method public java.lang.String getKey();
		method public java.lang.String getPackage();
		method public android.net.Uri getReference();
		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 java.lang.String KEY_CHANNEL_ID = "key_channel_id";
		field public static final java.lang.String KEY_PEOPLE = "key_people";
		field public static final java.lang.String KEY_SNOOZE_CRITERIA = "key_snooze_criteria";
		}

		public final class Condition implements android.os.Parcelable {
		@@ -35322,11 +35323,14 @@ package android.service.notification {

		public static class NotificationListenerService.Ranking {
		ctor public NotificationListenerService.Ranking();
		method public java.util.List<java.lang.String> getAdditionalPeople();
		method public android.app.NotificationChannel getChannel();
		method public int getImportance();
		method public java.lang.CharSequence getImportanceExplanation();
		method public java.lang.String getKey();
		method public java.lang.String getOverrideGroupKey();
		method public int getRank();
		method public java.util.List<android.service.notification.SnoozeCriterion> getSnoozeCriteria();
		method public int getSuppressedVisualEffects();
		method public boolean isAmbient();
		method public boolean matchesInterruptionFilter();
		@@ -35340,6 +35344,17 @@ package android.service.notification {
		field public static final android.os.Parcelable.Creator<android.service.notification.NotificationListenerService.RankingMap> CREATOR;
		}

		public final class SnoozeCriterion implements android.os.Parcelable {
		ctor public SnoozeCriterion(java.lang.String, java.lang.CharSequence, java.lang.CharSequence);
		ctor protected SnoozeCriterion(android.os.Parcel);
		method public int describeContents();
		method public java.lang.CharSequence getConfirmation();
		method public java.lang.CharSequence getExplanation();
		method public java.lang.String getId();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.service.notification.SnoozeCriterion> CREATOR;
		}

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

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

+19 −26

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

		import android.annotation.SystemApi;
		import android.net.Uri;
		import android.app.NotificationChannel;
		import android.os.Bundle;
		import android.os.Parcel;
		import android.os.Parcelable;
		@@ -27,33 +26,39 @@ import android.os.Parcelable;
		public final class Adjustment implements Parcelable {
		private final String mPackage;
		private final String mKey;
		private final int mImportance;
		private final CharSequence mExplanation;
		private final Uri mReference;
		private final Bundle mSignals;
		private final int mUser;

		/**
		* Data type: {@code String}. See {@link NotificationChannel#getId()}.
		*/
		public static final String KEY_CHANNEL_ID = "key_channel_id";
		/**
		* 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)}.
		*/
		public static final String KEY_PEOPLE = "key_people";
		/**
		* Parcelable {@code ArrayList} of {@link SnoozeCriterion}.
		*/
		public static final String KEY_SNOOZE_CRITERIA = "key_snooze_criteria";

		/**
		* Create a notification adjustment.
		*
		* @param pkg The package of the notification.
		* @param key The notification key.
		* @param importance The recommended importance of the notification.
		* @param signals A bundle of signals that should inform notification grouping and ordering.
		* @param signals A bundle of signals that should inform notification display, ordering, and
		* interruptiveness.
		* @param explanation A human-readable justification for the adjustment.
		* @param reference A reference to an external object that augments the
		* explanation, such as a
		* {@link android.provider.ContactsContract.Contacts#CONTENT_LOOKUP_URI},
		* or null.
		*/
		public Adjustment(String pkg, String key, int importance, Bundle signals,
		CharSequence explanation, Uri reference, int user) {
		public Adjustment(String pkg, String key, Bundle signals, CharSequence explanation, int user) {
		mPackage = pkg;
		mKey = key;
		mImportance = importance;
		mSignals = signals;
		mExplanation = explanation;
		mReference = reference;
		mUser = user;
		}

		@@ -68,13 +73,11 @@ public final class Adjustment implements Parcelable {
		} else {
		mKey = null;
		}
		mImportance = in.readInt();
		if (in.readInt() == 1) {
		mExplanation = in.readCharSequence();
		} else {
		mExplanation = null;
		}
		mReference = in.readParcelable(Uri.class.getClassLoader());
		mSignals = in.readBundle();
		mUser = in.readInt();
		}
		@@ -99,18 +102,10 @@ public final class Adjustment implements Parcelable {
		return mKey;
		}

		public int getImportance() {
		return mImportance;
		}

		public CharSequence getExplanation() {
		return mExplanation;
		}

		public Uri getReference() {
		return mReference;
		}

		public Bundle getSignals() {
		return mSignals;
		}
		@@ -138,14 +133,12 @@ public final class Adjustment implements Parcelable {
		} else {
		dest.writeInt(0);
		}
		dest.writeInt(mImportance);
		if (mExplanation != null) {
		dest.writeInt(1);
		dest.writeCharSequence(mExplanation);
		} else {
		dest.writeInt(0);
		}
		dest.writeParcelable(mReference, flags);
		dest.writeBundle(mSignals);
		dest.writeInt(mUser);
		}