Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6d15a881 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add Nullability annotations for Notification.Action.Builder methods."

parents 92eee2c7 e1fc87b5

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -5429,7 +5429,7 @@ package android.app { 
    method @NonNull public android.app.Notification.Action.Builder addRemoteInput(android.app.RemoteInput);

    method @NonNull public android.app.Notification.Action build();

    method @NonNull public android.app.Notification.Action.Builder extend(android.app.Notification.Action.Extender);

    method public android.os.Bundle getExtras();

    method @NonNull public android.os.Bundle getExtras();

    method @NonNull public android.app.Notification.Action.Builder setAllowGeneratedReplies(boolean);

    method @NonNull public android.app.Notification.Action.Builder setContextual(boolean);

    method @NonNull public android.app.Notification.Action.Builder setSemanticAction(int);

core/java/android/app/Notification.java

+10 −8
Original line number Diff line number Diff line
@@ -1569,12 +1569,12 @@ public class Notification implements Parcelable 
         * Builder class for {@link Action} objects.

         */

        public static final class Builder {

            private final Icon mIcon;

            private final CharSequence mTitle;

            private final PendingIntent mIntent;

            @Nullable private final Icon mIcon;

            @Nullable private final CharSequence mTitle;

            @Nullable private final PendingIntent mIntent;

            private boolean mAllowGeneratedReplies = true;

            private final Bundle mExtras;

            private ArrayList<RemoteInput> mRemoteInputs;

            @NonNull private final Bundle mExtras;

            @Nullable private ArrayList<RemoteInput> mRemoteInputs;

            private @SemanticAction int mSemanticAction;

            private boolean mIsContextual;
@@ -1610,8 +1610,9 @@ public class Notification implements Parcelable 
                        action.getAllowGeneratedReplies(), action.getSemanticAction());

            }



            private Builder(Icon icon, CharSequence title, PendingIntent intent, Bundle extras,

                    RemoteInput[] remoteInputs, boolean allowGeneratedReplies,

            private Builder(@Nullable Icon icon, @Nullable CharSequence title,

                    @Nullable PendingIntent intent, @NonNull Bundle extras,

                    @Nullable RemoteInput[] remoteInputs, boolean allowGeneratedReplies,

                    @SemanticAction int semanticAction) {

                mIcon = icon;

                mTitle = title;
@@ -1645,6 +1646,7 @@ public class Notification implements Parcelable 
             *

             * <p>The returned Bundle is shared with this Builder.

             */

            @NonNull

            public Bundle getExtras() {

                return mExtras;

            }