Merge "Remove unneeded type" into main (49e0f428) · Commits · e / os / android_frameworks_base

core/api/system-current.txt

+0 −1

Original line number	Diff line number	Diff line
		@@ -12907,7 +12907,6 @@ package android.service.notification {
		field @FlaggedApi("android.service.notification.notification_classification") public static final int TYPE_OTHER = 0; // 0x0
		field @FlaggedApi("android.service.notification.notification_classification") public static final int TYPE_PROMOTION = 1; // 0x1
		field @FlaggedApi("android.service.notification.notification_classification") public static final int TYPE_SOCIAL_MEDIA = 2; // 0x2
		field @FlaggedApi("android.service.notification.notification_classification") public static final int TYPE_UNKNOWN = -1; // 0xffffffff
		}

		public abstract class NotificationAssistantService extends android.service.notification.NotificationListenerService {

+2 −7

Original line number	Diff line number	Diff line
		@@ -184,7 +184,6 @@ public final class Adjustment implements Parcelable {

		/** @hide */
		@IntDef(prefix = { "TYPE_" }, value = {
		TYPE_UNKNOWN,
		TYPE_OTHER,
		TYPE_PROMOTION,
		TYPE_SOCIAL_MEDIA,
		@@ -195,12 +194,8 @@ public final class Adjustment implements Parcelable {
		public @interface Types {}

		/**
		* The type of this notification is unknown.
		*/
		@FlaggedApi(Flags.FLAG_NOTIFICATION_CLASSIFICATION)
		public static final int TYPE_UNKNOWN = -1;
		/**
		* The type of this notification is not one of ones known to the NotificationAssistantService.
		* This notification can be categorized, but not into one of the other categories known to the
		* OS at a given version.
		*/
		@FlaggedApi(Flags.FLAG_NOTIFICATION_CLASSIFICATION)
		public static final int TYPE_OTHER = 0;