Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add missing nullness annotations to Notification.Action and its Builder." am: 7a75dfd56d am: f32d46c8e0 am: 03e41b235c

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

Change-Id: I30df816b8300ee57479dab742f3ede5ff01be48a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Julia Reynolds
2023-01-13 22:03:13 +00:00
committed by Automerger Merge Worker
parent 5825b6a2f3 03e41b235c
commit 341a8d854b
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/api/current.txt
View File

@@ -6133,7 +6133,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();
@@ -6163,8 +6163,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);

14
core/java/android/app/Notification.java
View File

@@ -1782,7 +1782,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 */);
}
@@ -1907,10 +1907,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);
}
@@ -1939,9 +1941,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);
}