Merge "Add missing nullness annotations to Notification.Action and its Builder." (7a75dfd5) · Commits · e / os / android_frameworks_base

core/api/current.txt

+3 −3

Original line number	Diff line number	Diff line
		@@ -6024,7 +6024,7 @@ package android.app {
		}

		public static class Notification.Action implements android.os.Parcelable {
		ctor @Deprecated public Notification.Action(int, CharSequence, android.app.PendingIntent);
		ctor @Deprecated public Notification.Action(int, CharSequence, @Nullable android.app.PendingIntent);
		method public android.app.Notification.Action clone();
		method public int describeContents();
		method public boolean getAllowGeneratedReplies();
		@@ -6054,8 +6054,8 @@ package android.app {
		}

		public static final class Notification.Action.Builder {
		ctor @Deprecated public Notification.Action.Builder(int, CharSequence, android.app.PendingIntent);
		ctor public Notification.Action.Builder(android.graphics.drawable.Icon, CharSequence, android.app.PendingIntent);
		ctor @Deprecated public Notification.Action.Builder(int, CharSequence, @Nullable android.app.PendingIntent);
		ctor public Notification.Action.Builder(android.graphics.drawable.Icon, CharSequence, @Nullable android.app.PendingIntent);
		ctor public Notification.Action.Builder(android.app.Notification.Action);
		method @NonNull public android.app.Notification.Action.Builder addExtras(android.os.Bundle);
		method @NonNull public android.app.Notification.Action.Builder addRemoteInput(android.app.RemoteInput);

core/java/android/app/Notification.java

+9 −5

Original line number	Diff line number	Diff line
		@@ -1783,7 +1783,7 @@ public class Notification implements Parcelable
		* @deprecated Use {@link android.app.Notification.Action.Builder}.
		*/
		@Deprecated
		public Action(int icon, CharSequence title, PendingIntent intent) {
		public Action(int icon, CharSequence title, @Nullable PendingIntent intent) {
		this(Icon.createWithResource("", icon), title, intent, new Bundle(), null, true,
		SEMANTIC_ACTION_NONE, false /* isContextual /, false / requireAuth */);
		}
		@@ -1908,10 +1908,12 @@ public class Notification implements Parcelable
		* which may display them in other contexts, for example on a wearable device.
		* @param icon icon to show for this action
		* @param title the title of the action
		* @param intent the {@link PendingIntent} to fire when users trigger this action
		* @param intent the {@link PendingIntent} to fire when users trigger this action. May
		* be null, in which case the action may be rendered in a disabled presentation by the
		* system UI.
		*/
		@Deprecated
		public Builder(int icon, CharSequence title, PendingIntent intent) {
		public Builder(int icon, CharSequence title, @Nullable PendingIntent intent) {
		this(Icon.createWithResource("", icon), title, intent);
		}

		@@ -1940,9 +1942,11 @@ public class Notification implements Parcelable
		*
		* @param icon icon to show for this action
		* @param title the title of the action
		* @param intent the {@link PendingIntent} to fire when users trigger this action
		* @param intent the {@link PendingIntent} to fire when users trigger this action. May
		* be null, in which case the action may be rendered in a disabled presentation by the
		* system UI.
		*/
		public Builder(Icon icon, CharSequence title, PendingIntent intent) {
		public Builder(Icon icon, CharSequence title, @Nullable PendingIntent intent) {
		this(icon, title, intent, new Bundle(), null, true, SEMANTIC_ACTION_NONE, false);
		}