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

Commit 03e41b23 authored by Julia Reynolds's avatar Julia Reynolds Committed by Automerger Merge Worker
Browse files

Merge "Add missing nullness annotations to Notification.Action and its... 

Merge "Add missing nullness annotations to Notification.Action and its Builder." am: 7a75dfd5 am: f32d46c8

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2383854



Change-Id: Iccf5b2a07016073938f302c6f7f34419d29e75e4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d82dc9f3 f32d46c8

core/api/current.txt

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

  }

















  public static class Notification.Action implements android.os.Parcelable {







  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 android.app.Notification.Action clone();











    method public int describeContents();







    method public int describeContents();











    method public boolean getAllowGeneratedReplies();







    method public boolean getAllowGeneratedReplies();










@@ -6054,8 +6054,8 @@ package android.app {









  }







  }



























  public static final class Notification.Action.Builder {







  public static final class Notification.Action.Builder {











    ctor @Deprecated public Notification.Action.Builder(int, 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, 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);







    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 addExtras(android.os.Bundle);











    method @NonNull public android.app.Notification.Action.Builder addRemoteInput(android.app.RemoteInput);







    method @NonNull public android.app.Notification.Action.Builder addRemoteInput(android.app.RemoteInput);

























core/java/android/app/Notification.java



+9
−5




























Original line number
Original line
Diff line number
Diff line








@@ -1783,7 +1783,7 @@ public class Notification implements Parcelable









         * @deprecated Use {@link android.app.Notification.Action.Builder}.







         * @deprecated Use {@link android.app.Notification.Action.Builder}.











         */







         */











        @Deprecated







        @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,







            this(Icon.createWithResource("", icon), title, intent, new Bundle(), null, true,











                    SEMANTIC_ACTION_NONE, false /* isContextual */, false /* requireAuth */);







                    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.







             * which may display them in other contexts, for example on a wearable device.











             * @param icon icon to show for this action







             * @param icon icon to show for this action











             * @param title the title of the 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







            @Deprecated











            public Builder(int icon, CharSequence title, PendingIntent intent) {







            public Builder(int icon, CharSequence title, @Nullable PendingIntent intent) {











                this(Icon.createWithResource("", icon), title, 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 icon icon to show for this action











             * @param title the title of the 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);







                this(icon, title, intent, new Bundle(), null, true, SEMANTIC_ACTION_NONE, false);











            }







            }