Merge "Expose dismiss reasons to notification listeners." (05675c80) · Commits · e / os / android_frameworks_base

api/current.txt

+21 −20

Original line number	Diff line number	Diff line
		@@ -32080,10 +32080,10 @@ package android.provider {
		field public static final java.lang.String EXTRA_ERROR = "error";
		field public static final java.lang.String EXTRA_EXCLUDE_SELF = "android.provider.extra.EXCLUDE_SELF";
		field public static final java.lang.String EXTRA_INFO = "info";
		field public static final java.lang.String EXTRA_INITIAL_URI = "android.provider.extra.INITIAL_URI";
		field public static final java.lang.String EXTRA_LOADING = "loading";
		field public static final java.lang.String EXTRA_ORIENTATION = "android.provider.extra.ORIENTATION";
		field public static final java.lang.String EXTRA_PROMPT = "android.provider.extra.PROMPT";
		field public static final java.lang.String EXTRA_INITIAL_URI = "android.provider.extra.INITIAL_URI";
		field public static final java.lang.String PROVIDER_INTERFACE = "android.content.action.DOCUMENTS_PROVIDER";
		}

		@@ -34917,25 +34917,6 @@ package android.service.notification {
		method public final void adjustNotifications(java.util.List<android.service.notification.Adjustment>);
		method public final android.os.IBinder onBind(android.content.Intent);
		method public abstract android.service.notification.Adjustment onNotificationEnqueued(android.service.notification.StatusBarNotification, int, boolean);
		method public void onNotificationRemoved(java.lang.String, long, int);
		field public static final int REASON_APP_CANCEL = 8; // 0x8
		field public static final int REASON_APP_CANCEL_ALL = 9; // 0x9
		field public static final int REASON_CHANNEL_BANNED = 17; // 0x11
		field public static final int REASON_DELEGATE_CANCEL = 2; // 0x2
		field public static final int REASON_DELEGATE_CANCEL_ALL = 3; // 0x3
		field public static final int REASON_DELEGATE_CLICK = 1; // 0x1
		field public static final int REASON_DELEGATE_ERROR = 4; // 0x4
		field public static final int REASON_GROUP_OPTIMIZATION = 13; // 0xd
		field public static final int REASON_GROUP_SUMMARY_CANCELED = 12; // 0xc
		field public static final int REASON_LISTENER_CANCEL = 10; // 0xa
		field public static final int REASON_LISTENER_CANCEL_ALL = 11; // 0xb
		field public static final int REASON_PACKAGE_BANNED = 7; // 0x7
		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_SNOOZED = 18; // 0x12
		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.NotificationAssistantService";
		}

		@@ -34960,6 +34941,7 @@ package android.service.notification {
		method public void onNotificationRankingUpdate(android.service.notification.NotificationListenerService.RankingMap);
		method public void onNotificationRemoved(android.service.notification.StatusBarNotification);
		method public void onNotificationRemoved(android.service.notification.StatusBarNotification, android.service.notification.NotificationListenerService.RankingMap);
		method public void onNotificationRemoved(android.service.notification.StatusBarNotification, android.service.notification.NotificationListenerService.RankingMap, int);
		method public final void requestInterruptionFilter(int);
		method public final void requestListenerHints(int);
		method public static void requestRebind(android.content.ComponentName);
		@@ -34974,6 +34956,25 @@ package android.service.notification {
		field public static final int INTERRUPTION_FILTER_NONE = 3; // 0x3
		field public static final int INTERRUPTION_FILTER_PRIORITY = 2; // 0x2
		field public static final int INTERRUPTION_FILTER_UNKNOWN = 0; // 0x0
		field public static final int REASON_APP_CANCEL = 8; // 0x8
		field public static final int REASON_APP_CANCEL_ALL = 9; // 0x9
		field public static final int REASON_CHANNEL_BANNED = 17; // 0x11
		field public static final int REASON_DELEGATE_CANCEL = 2; // 0x2
		field public static final int REASON_DELEGATE_CANCEL_ALL = 3; // 0x3
		field public static final int REASON_DELEGATE_CLICK = 1; // 0x1
		field public static final int REASON_DELEGATE_ERROR = 4; // 0x4
		field public static final int REASON_GROUP_OPTIMIZATION = 13; // 0xd
		field public static final int REASON_GROUP_SUMMARY_CANCELED = 12; // 0xc
		field public static final int REASON_LISTENER_CANCEL = 10; // 0xa
		field public static final int REASON_LISTENER_CANCEL_ALL = 11; // 0xb
		field public static final int REASON_PACKAGE_BANNED = 7; // 0x7
		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_SNOOZED = 18; // 0x12
		field public static final int REASON_UNAUTOBUNDLED = 16; // 0x10
		field public static final int REASON_USER_STOPPED = 6; // 0x6
		field public static final int REASON_USER_SWITCH = 19; // 0x13
		field public static final java.lang.String SERVICE_INTERFACE = "android.service.notification.NotificationListenerService";
		field public static final int SUPPRESSED_EFFECT_SCREEN_OFF = 1; // 0x1
		field public static final int SUPPRESSED_EFFECT_SCREEN_ON = 2; // 0x2

api/system-current.txt

+21 −20

Original line number	Diff line number	Diff line
		@@ -34768,10 +34768,10 @@ package android.provider {
		field public static final java.lang.String EXTRA_ERROR = "error";
		field public static final java.lang.String EXTRA_EXCLUDE_SELF = "android.provider.extra.EXCLUDE_SELF";
		field public static final java.lang.String EXTRA_INFO = "info";
		field public static final java.lang.String EXTRA_INITIAL_URI = "android.provider.extra.INITIAL_URI";
		field public static final java.lang.String EXTRA_LOADING = "loading";
		field public static final java.lang.String EXTRA_ORIENTATION = "android.provider.extra.ORIENTATION";
		field public static final java.lang.String EXTRA_PROMPT = "android.provider.extra.PROMPT";
		field public static final java.lang.String EXTRA_INITIAL_URI = "android.provider.extra.INITIAL_URI";
		field public static final java.lang.String PROVIDER_INTERFACE = "android.content.action.DOCUMENTS_PROVIDER";
		}

		@@ -37710,25 +37710,6 @@ package android.service.notification {
		method public final void adjustNotifications(java.util.List<android.service.notification.Adjustment>);
		method public final android.os.IBinder onBind(android.content.Intent);
		method public abstract android.service.notification.Adjustment onNotificationEnqueued(android.service.notification.StatusBarNotification, int, boolean);
		method public void onNotificationRemoved(java.lang.String, long, int);
		field public static final int REASON_APP_CANCEL = 8; // 0x8
		field public static final int REASON_APP_CANCEL_ALL = 9; // 0x9
		field public static final int REASON_CHANNEL_BANNED = 17; // 0x11
		field public static final int REASON_DELEGATE_CANCEL = 2; // 0x2
		field public static final int REASON_DELEGATE_CANCEL_ALL = 3; // 0x3
		field public static final int REASON_DELEGATE_CLICK = 1; // 0x1
		field public static final int REASON_DELEGATE_ERROR = 4; // 0x4
		field public static final int REASON_GROUP_OPTIMIZATION = 13; // 0xd
		field public static final int REASON_GROUP_SUMMARY_CANCELED = 12; // 0xc
		field public static final int REASON_LISTENER_CANCEL = 10; // 0xa
		field public static final int REASON_LISTENER_CANCEL_ALL = 11; // 0xb
		field public static final int REASON_PACKAGE_BANNED = 7; // 0x7
		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_SNOOZED = 18; // 0x12
		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.NotificationAssistantService";
		}

		@@ -37755,6 +37736,7 @@ package android.service.notification {
		method public void onNotificationRankingUpdate(android.service.notification.NotificationListenerService.RankingMap);
		method public void onNotificationRemoved(android.service.notification.StatusBarNotification);
		method public void onNotificationRemoved(android.service.notification.StatusBarNotification, android.service.notification.NotificationListenerService.RankingMap);
		method public void onNotificationRemoved(android.service.notification.StatusBarNotification, android.service.notification.NotificationListenerService.RankingMap, int);
		method public void registerAsSystemService(android.content.Context, android.content.ComponentName, int) throws android.os.RemoteException;
		method public final void requestInterruptionFilter(int);
		method public final void requestListenerHints(int);
		@@ -37772,6 +37754,25 @@ package android.service.notification {
		field public static final int INTERRUPTION_FILTER_NONE = 3; // 0x3
		field public static final int INTERRUPTION_FILTER_PRIORITY = 2; // 0x2
		field public static final int INTERRUPTION_FILTER_UNKNOWN = 0; // 0x0
		field public static final int REASON_APP_CANCEL = 8; // 0x8
		field public static final int REASON_APP_CANCEL_ALL = 9; // 0x9
		field public static final int REASON_CHANNEL_BANNED = 17; // 0x11
		field public static final int REASON_DELEGATE_CANCEL = 2; // 0x2
		field public static final int REASON_DELEGATE_CANCEL_ALL = 3; // 0x3
		field public static final int REASON_DELEGATE_CLICK = 1; // 0x1
		field public static final int REASON_DELEGATE_ERROR = 4; // 0x4
		field public static final int REASON_GROUP_OPTIMIZATION = 13; // 0xd
		field public static final int REASON_GROUP_SUMMARY_CANCELED = 12; // 0xc
		field public static final int REASON_LISTENER_CANCEL = 10; // 0xa
		field public static final int REASON_LISTENER_CANCEL_ALL = 11; // 0xb
		field public static final int REASON_PACKAGE_BANNED = 7; // 0x7
		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_SNOOZED = 18; // 0x12
		field public static final int REASON_UNAUTOBUNDLED = 16; // 0x10
		field public static final int REASON_USER_STOPPED = 6; // 0x6
		field public static final int REASON_USER_SWITCH = 19; // 0x13
		field public static final java.lang.String SERVICE_INTERFACE = "android.service.notification.NotificationListenerService";
		field public static final int SUPPRESSED_EFFECT_SCREEN_OFF = 1; // 0x1
		field public static final int SUPPRESSED_EFFECT_SCREEN_ON = 2; // 0x2

api/test-current.txt

+21 −20

Original line number	Diff line number	Diff line
		@@ -32166,10 +32166,10 @@ package android.provider {
		field public static final java.lang.String EXTRA_ERROR = "error";
		field public static final java.lang.String EXTRA_EXCLUDE_SELF = "android.provider.extra.EXCLUDE_SELF";
		field public static final java.lang.String EXTRA_INFO = "info";
		field public static final java.lang.String EXTRA_INITIAL_URI = "android.provider.extra.INITIAL_URI";
		field public static final java.lang.String EXTRA_LOADING = "loading";
		field public static final java.lang.String EXTRA_ORIENTATION = "android.provider.extra.ORIENTATION";
		field public static final java.lang.String EXTRA_PROMPT = "android.provider.extra.PROMPT";
		field public static final java.lang.String EXTRA_INITIAL_URI = "android.provider.extra.INITIAL_URI";
		field public static final java.lang.String PROVIDER_INTERFACE = "android.content.action.DOCUMENTS_PROVIDER";
		}

		@@ -35007,25 +35007,6 @@ package android.service.notification {
		method public final void adjustNotifications(java.util.List<android.service.notification.Adjustment>);
		method public final android.os.IBinder onBind(android.content.Intent);
		method public abstract android.service.notification.Adjustment onNotificationEnqueued(android.service.notification.StatusBarNotification, int, boolean);
		method public void onNotificationRemoved(java.lang.String, long, int);
		field public static final int REASON_APP_CANCEL = 8; // 0x8
		field public static final int REASON_APP_CANCEL_ALL = 9; // 0x9
		field public static final int REASON_CHANNEL_BANNED = 17; // 0x11
		field public static final int REASON_DELEGATE_CANCEL = 2; // 0x2
		field public static final int REASON_DELEGATE_CANCEL_ALL = 3; // 0x3
		field public static final int REASON_DELEGATE_CLICK = 1; // 0x1
		field public static final int REASON_DELEGATE_ERROR = 4; // 0x4
		field public static final int REASON_GROUP_OPTIMIZATION = 13; // 0xd
		field public static final int REASON_GROUP_SUMMARY_CANCELED = 12; // 0xc
		field public static final int REASON_LISTENER_CANCEL = 10; // 0xa
		field public static final int REASON_LISTENER_CANCEL_ALL = 11; // 0xb
		field public static final int REASON_PACKAGE_BANNED = 7; // 0x7
		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_SNOOZED = 18; // 0x12
		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.NotificationAssistantService";
		}

		@@ -35050,6 +35031,7 @@ package android.service.notification {
		method public void onNotificationRankingUpdate(android.service.notification.NotificationListenerService.RankingMap);
		method public void onNotificationRemoved(android.service.notification.StatusBarNotification);
		method public void onNotificationRemoved(android.service.notification.StatusBarNotification, android.service.notification.NotificationListenerService.RankingMap);
		method public void onNotificationRemoved(android.service.notification.StatusBarNotification, android.service.notification.NotificationListenerService.RankingMap, int);
		method public final void requestInterruptionFilter(int);
		method public final void requestListenerHints(int);
		method public static void requestRebind(android.content.ComponentName);
		@@ -35064,6 +35046,25 @@ package android.service.notification {
		field public static final int INTERRUPTION_FILTER_NONE = 3; // 0x3
		field public static final int INTERRUPTION_FILTER_PRIORITY = 2; // 0x2
		field public static final int INTERRUPTION_FILTER_UNKNOWN = 0; // 0x0
		field public static final int REASON_APP_CANCEL = 8; // 0x8
		field public static final int REASON_APP_CANCEL_ALL = 9; // 0x9
		field public static final int REASON_CHANNEL_BANNED = 17; // 0x11
		field public static final int REASON_DELEGATE_CANCEL = 2; // 0x2
		field public static final int REASON_DELEGATE_CANCEL_ALL = 3; // 0x3
		field public static final int REASON_DELEGATE_CLICK = 1; // 0x1
		field public static final int REASON_DELEGATE_ERROR = 4; // 0x4
		field public static final int REASON_GROUP_OPTIMIZATION = 13; // 0xd
		field public static final int REASON_GROUP_SUMMARY_CANCELED = 12; // 0xc
		field public static final int REASON_LISTENER_CANCEL = 10; // 0xa
		field public static final int REASON_LISTENER_CANCEL_ALL = 11; // 0xb
		field public static final int REASON_PACKAGE_BANNED = 7; // 0x7
		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_SNOOZED = 18; // 0x12
		field public static final int REASON_UNAUTOBUNDLED = 16; // 0x10
		field public static final int REASON_USER_STOPPED = 6; // 0x6
		field public static final int REASON_USER_SWITCH = 19; // 0x13
		field public static final java.lang.String SERVICE_INTERFACE = "android.service.notification.NotificationListenerService";
		field public static final int SUPPRESSED_EFFECT_SCREEN_OFF = 1; // 0x1
		field public static final int SUPPRESSED_EFFECT_SCREEN_ON = 2; // 0x2

core/java/android/service/notification/INotificationListener.aidl

+1 −2

Original line number	Diff line number	Diff line
		@@ -28,7 +28,7 @@ oneway interface INotificationListener
		void onNotificationPosted(in IStatusBarNotificationHolder notificationHolder,
		in NotificationRankingUpdate update);
		void onNotificationRemoved(in IStatusBarNotificationHolder notificationHolder,
		in NotificationRankingUpdate update);
		in NotificationRankingUpdate update, int reason);
		void onNotificationRankingUpdate(in NotificationRankingUpdate update);
		void onListenerHintsChanged(int hints);
		void onInterruptionFilterChanged(int interruptionFilter);
		@@ -38,5 +38,4 @@ oneway interface INotificationListener
		void onNotificationVisibilityChanged(String key, long time, boolean visible);
		void onNotificationClick(String key, long time);
		void onNotificationActionClick(String key, long time, int actionIndex);
		void onNotificationRemovedReason(String key, long time, int reason);
		}

core/java/android/service/notification/NotificationAssistantService.java

+0 −85

Original line number	Diff line number	Diff line
		@@ -42,60 +42,6 @@ public abstract class NotificationAssistantService extends NotificationListenerS
		public static final String SERVICE_INTERFACE
		= "android.service.notification.NotificationAssistantService";

		/** Notification was canceled by the status bar reporting a click. */
		public static final int REASON_DELEGATE_CLICK = 1;

		/** Notification was canceled by the status bar reporting a user dismissal. */
		public static final int REASON_DELEGATE_CANCEL = 2;

		/** Notification was canceled by the status bar reporting a user dismiss all. */
		public static final int REASON_DELEGATE_CANCEL_ALL = 3;

		/** Notification was canceled by the status bar reporting an inflation error. */
		public static final int REASON_DELEGATE_ERROR = 4;

		/** Notification was canceled by the package manager modifying the package. */
		public static final int REASON_PACKAGE_CHANGED = 5;

		/** Notification was canceled by the owning user context being stopped. */
		public static final int REASON_USER_STOPPED = 6;

		/** Notification was canceled by the user banning the package. */
		public static final int REASON_PACKAGE_BANNED = 7;

		/** Notification was canceled by the app canceling this specific notification. */
		public static final int REASON_APP_CANCEL = 8;

		/** Notification was canceled by the app cancelling all its notifications. */
		public static final int REASON_APP_CANCEL_ALL = 9;

		/** Notification was canceled by a listener reporting a user dismissal. */
		public static final int REASON_LISTENER_CANCEL = 10;

		/** Notification was canceled by a listener reporting a user dismiss all. */
		public static final int REASON_LISTENER_CANCEL_ALL = 11;

		/** Notification was canceled because it was a member of a canceled group. */
		public static final int REASON_GROUP_SUMMARY_CANCELED = 12;

		/** Notification was canceled because it was an invisible member of a group. */
		public static final int REASON_GROUP_OPTIMIZATION = 13;

		/** Notification was canceled by the device administrator suspending the package. */
		public static final int REASON_PACKAGE_SUSPENDED = 14;

		/** Notification was canceled by the owning managed profile being turned off. */
		public static final int REASON_PROFILE_TURNED_OFF = 15;

		/** Autobundled summary notification was canceled because its group was unbundled */
		public static final int REASON_UNAUTOBUNDLED = 16;

		/** Notification was canceled by the user banning the channel. */
		public static final int REASON_CHANNEL_BANNED = 17;

		/** Notification was snoozed. */
		public static final int REASON_SNOOZED = 18;

		private Handler mHandler;

		@Override
		@@ -123,17 +69,6 @@ public abstract class NotificationAssistantService extends NotificationListenerS
		abstract public Adjustment onNotificationEnqueued(StatusBarNotification sbn,
		int importance, boolean user);

		/**
		* A notification was removed.

		* @param key the notification key
		* @param time milliseconds since midnight, January 1, 1970 UTC.
		* @param reason see {@link #REASON_LISTENER_CANCEL}, etc.
		*/
		public void onNotificationRemoved(String key, long time, int reason) {
		// Do nothing, Override this to collect dismissal statistics
		}

		/**
		* Updates a notification. N.B. this won’t cause
		* an existing notification to alert, but might allow a future update to
		@@ -185,21 +120,10 @@ public abstract class NotificationAssistantService extends NotificationListenerS
		mHandler.obtainMessage(MyHandler.MSG_ON_NOTIFICATION_ENQUEUED,
		args).sendToTarget();
		}

		@Override
		public void onNotificationRemovedReason(String key, long time, int reason) {
		SomeArgs args = SomeArgs.obtain();
		args.arg1 = key;
		args.arg2 = time;
		args.argi1 = reason;
		mHandler.obtainMessage(MyHandler.MSG_ON_NOTIFICATION_REMOVED_REASON,
		args).sendToTarget();
		}
		}

		private final class MyHandler extends Handler {
		public static final int MSG_ON_NOTIFICATION_ENQUEUED = 1;
		public static final int MSG_ON_NOTIFICATION_REMOVED_REASON = 5;

		public MyHandler(Looper looper) {
		super(looper, null, false);
		@@ -219,15 +143,6 @@ public abstract class NotificationAssistantService extends NotificationListenerS
		adjustNotification(adjustment);
		}
		} break;

		case MSG_ON_NOTIFICATION_REMOVED_REASON: {
		SomeArgs args = (SomeArgs) msg.obj;
		final String key = (String) args.arg1;
		final long time = (long) args.arg2;
		final int reason = args.argi1;
		args.recycle();
		onNotificationRemoved(key, time, reason);
		} break;
		}
		}
		}