Allow the ranker to autobundle notifications. (e46bb37a) · Commits · e / os / android_frameworks_base

api/current.txt

+4 −0

Original line number	Diff line number	Diff line
		@@ -34739,6 +34739,7 @@ package android.service.notification {
		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 int getSuppressedVisualEffects();
		method public boolean isAmbient();
		@@ -34769,13 +34770,16 @@ package android.service.notification {
		method public int getId();
		method public java.lang.String getKey();
		method public android.app.Notification getNotification();
		method public java.lang.String getOverrideGroupKey();
		method public java.lang.String getPackageName();
		method public long getPostTime();
		method public java.lang.String getTag();
		method public android.os.UserHandle getUser();
		method public deprecated int getUserId();
		method public boolean isClearable();
		method public boolean isGroup();
		method public boolean isOngoing();
		method public void setOverrideGroupKey(java.lang.String);
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.service.notification.StatusBarNotification> CREATOR;
		}

api/system-current.txt

+25 −6

Original line number	Diff line number	Diff line
		@@ -5076,6 +5076,7 @@ package android.app {
		field public static final java.lang.String EXTRA_THREAD_TITLE = "android.threadTitle";
		field public static final java.lang.String EXTRA_TITLE = "android.title";
		field public static final java.lang.String EXTRA_TITLE_BIG = "android.title.big";
		field public static final int FLAG_AUTOGROUP_SUMMARY = 1024; // 0x400
		field public static final int FLAG_AUTO_CANCEL = 16; // 0x10
		field public static final int FLAG_FOREGROUND_SERVICE = 64; // 0x40
		field public static final int FLAG_GROUP_SUMMARY = 512; // 0x200
		@@ -37117,6 +37118,22 @@ 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);
		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 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 GROUP_KEY_OVERRIDE_KEY = "group_key_override";
		field public static final java.lang.String NEEDS_AUTOGROUPING_KEY = "autogroup_needed";
		}

		public class Condition implements android.os.Parcelable {
		ctor public Condition(android.net.Uri, java.lang.String, int);
		ctor public Condition(android.net.Uri, java.lang.String, java.lang.String, java.lang.String, int, int, int);
		@@ -37210,6 +37227,7 @@ package android.service.notification {
		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 int getSuppressedVisualEffects();
		method public boolean isAmbient();
		@@ -37233,11 +37251,12 @@ package android.service.notification {

		public abstract class NotificationRankerService extends android.service.notification.NotificationListenerService {
		ctor public NotificationRankerService();
		method public final void adjustImportance(java.lang.String, android.service.notification.NotificationRankerService.Adjustment);
		method public final void adjustNotification(android.service.notification.Adjustment);
		method public final void adjustNotifications(java.util.List<android.service.notification.Adjustment>);
		method public final android.os.IBinder onBind(android.content.Intent);
		method public void onNotificationActionClick(java.lang.String, long, int);
		method public void onNotificationClick(java.lang.String, long);
		method public abstract android.service.notification.NotificationRankerService.Adjustment onNotificationEnqueued(android.service.notification.StatusBarNotification, int, boolean);
		method public abstract android.service.notification.Adjustment onNotificationEnqueued(android.service.notification.StatusBarNotification, int, boolean);
		method public void onNotificationRemoved(java.lang.String, long, int);
		method public void onNotificationVisibilityChanged(java.lang.String, long, boolean);
		field public static final int REASON_APP_CANCEL = 8; // 0x8
		@@ -37254,14 +37273,11 @@ package android.service.notification {
		field public static final int REASON_PACKAGE_CHANGED = 5; // 0x5
		field public static final int REASON_PACKAGE_SUSPENDED = 14; // 0xe
		field public static final int REASON_PROFILE_TURNED_OFF = 15; // 0xf
		field public static final int REASON_UNAUTOBUNDLED = 16; // 0x10
		field public static final int REASON_USER_STOPPED = 6; // 0x6
		field public static final java.lang.String SERVICE_INTERFACE = "android.service.notification.NotificationRankerService";
		}

		public class NotificationRankerService.Adjustment {
		ctor public NotificationRankerService.Adjustment(int, java.lang.CharSequence, android.net.Uri);
		}

		public class StatusBarNotification implements android.os.Parcelable {
		ctor public 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);
		@@ -37271,13 +37287,16 @@ package android.service.notification {
		method public int getId();
		method public java.lang.String getKey();
		method public android.app.Notification getNotification();
		method public java.lang.String getOverrideGroupKey();
		method public java.lang.String getPackageName();
		method public long getPostTime();
		method public java.lang.String getTag();
		method public android.os.UserHandle getUser();
		method public deprecated int getUserId();
		method public boolean isClearable();
		method public boolean isGroup();
		method public boolean isOngoing();
		method public void setOverrideGroupKey(java.lang.String);
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.service.notification.StatusBarNotification> CREATOR;
		}

api/test-current.txt

+4 −0

Original line number	Diff line number	Diff line
		@@ -34812,6 +34812,7 @@ package android.service.notification {
		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 int getSuppressedVisualEffects();
		method public boolean isAmbient();
		@@ -34842,13 +34843,16 @@ package android.service.notification {
		method public int getId();
		method public java.lang.String getKey();
		method public android.app.Notification getNotification();
		method public java.lang.String getOverrideGroupKey();
		method public java.lang.String getPackageName();
		method public long getPostTime();
		method public java.lang.String getTag();
		method public android.os.UserHandle getUser();
		method public deprecated int getUserId();
		method public boolean isClearable();
		method public boolean isGroup();
		method public boolean isOngoing();
		method public void setOverrideGroupKey(java.lang.String);
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.service.notification.StatusBarNotification> CREATOR;
		}

core/java/android/app/INotificationManager.aidl

+3 −1

Original line number	Diff line number	Diff line
		@@ -25,6 +25,7 @@ import android.content.Intent;
		import android.content.pm.ParceledListSlice;
		import android.net.Uri;
		import android.os.Bundle;
		import android.service.notification.Adjustment;
		import android.service.notification.Condition;
		import android.service.notification.IConditionListener;
		import android.service.notification.IConditionProvider;
		@@ -80,7 +81,8 @@ interface INotificationManager
		void setOnNotificationPostedTrimFromListener(in INotificationListener token, int trim);
		void setInterruptionFilter(String pkg, int interruptionFilter);

		void setImportanceFromRankerService(in INotificationListener token, String key, int importance, CharSequence explanation);
		void applyAdjustmentFromRankerService(in INotificationListener token, in Adjustment adjustment);
		void applyAdjustmentsFromRankerService(in INotificationListener token, in List<Adjustment> adjustments);

		ComponentName getEffectsSuppressor();
		boolean matchesCallFilter(in Bundle extras);

core/java/android/app/Notification.java

+15 −8

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@ import android.annotation.DrawableRes;
		import android.annotation.IntDef;
		import android.annotation.SdkConstant;
		import android.annotation.SdkConstant.SdkConstantType;
		import android.annotation.SystemApi;
		import android.content.Context;
		import android.content.Intent;
		import android.content.pm.ApplicationInfo;
		@@ -496,6 +497,15 @@ public class Notification implements Parcelable
		*/
		public static final int FLAG_GROUP_SUMMARY = 0x00000200;

		/**
		* Bit to be bitswise-ored into the {@link #flags} field that should be
		* set if this notification is the group summary for an auto-group of notifications.
		*
		* @hide
		*/
		@SystemApi
		public static final int FLAG_AUTOGROUP_SUMMARY = 0x00000400;

		public int flags;

		/** @hide */
		@@ -1945,14 +1955,10 @@ public class Notification implements Parcelable
		* @hide
		*/
		public static void addFieldsFromContext(Context context, Notification notification) {
		if (notification.extras.getParcelable(EXTRA_BUILDER_APPLICATION_INFO) == null) {
		notification.extras.putParcelable(EXTRA_BUILDER_APPLICATION_INFO,
		context.getApplicationInfo());
		}
		if (!notification.extras.containsKey(EXTRA_ORIGINATING_USERID)) {
		notification.extras.putInt(EXTRA_ORIGINATING_USERID, context.getUserId());
		}
		}

		@Override
		public String toString() {
		@@ -3020,12 +3026,13 @@ public class Notification implements Parcelable
		/**
		* @hide
		*/
		public void setFlag(int mask, boolean value) {
		public Builder setFlag(int mask, boolean value) {
		if (value) {
		mN.flags \|= mask;
		} else {
		mN.flags &= ~mask;
		}
		return this;
		}

		/**