Skip to content

Commit 106ec4d

Browse files
committed
Fix docs for PendingIntent.getBroadcast() and annotate as nullable
Fixes: 277630907 Test: docs only Relnote: PendingIntent.getBroadcast() is now correctly marked @nullable Change-Id: Ifff965b38abb4fccc4709a52a5a71d6372a388a5
1 parent 5db8880 commit 106ec4d

File tree

6 files changed

+16
-6
lines changed

6 files changed

+16
-6
lines changed

core/core/api/current.ignore

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
// Baseline format: 1.0
2+
InvalidNullConversion: androidx.core.app.PendingIntentCompat#getBroadcast(android.content.Context, int, android.content.Intent, int, boolean):
3+
Attempted to change method return from @NonNull to @Nullable: incompatible change for method androidx.core.app.PendingIntentCompat.getBroadcast(android.content.Context,int,android.content.Intent,int,boolean)

core/core/api/current.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -866,7 +866,7 @@ package androidx.core.app {
866866
method public static android.app.PendingIntent getActivities(android.content.Context, int, android.content.Intent![], int, boolean);
867867
method public static android.app.PendingIntent getActivity(android.content.Context, int, android.content.Intent, int, boolean);
868868
method public static android.app.PendingIntent getActivity(android.content.Context, int, android.content.Intent, int, android.os.Bundle, boolean);
869-
method public static android.app.PendingIntent getBroadcast(android.content.Context, int, android.content.Intent, int, boolean);
869+
method public static android.app.PendingIntent? getBroadcast(android.content.Context, int, android.content.Intent, int, boolean);
870870
method @RequiresApi(26) public static android.app.PendingIntent getForegroundService(android.content.Context, int, android.content.Intent, int, boolean);
871871
method public static android.app.PendingIntent getService(android.content.Context, int, android.content.Intent, int, boolean);
872872
}

core/core/api/public_plus_experimental_current.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -866,7 +866,7 @@ package androidx.core.app {
866866
method public static android.app.PendingIntent getActivities(android.content.Context, int, android.content.Intent![], int, boolean);
867867
method public static android.app.PendingIntent getActivity(android.content.Context, int, android.content.Intent, int, boolean);
868868
method public static android.app.PendingIntent getActivity(android.content.Context, int, android.content.Intent, int, android.os.Bundle, boolean);
869-
method public static android.app.PendingIntent getBroadcast(android.content.Context, int, android.content.Intent, int, boolean);
869+
method public static android.app.PendingIntent? getBroadcast(android.content.Context, int, android.content.Intent, int, boolean);
870870
method @RequiresApi(26) public static android.app.PendingIntent getForegroundService(android.content.Context, int, android.content.Intent, int, boolean);
871871
method public static android.app.PendingIntent getService(android.content.Context, int, android.content.Intent, int, boolean);
872872
}
+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
// Baseline format: 1.0
2+
InvalidNullConversion: androidx.core.app.PendingIntentCompat#getBroadcast(android.content.Context, int, android.content.Intent, int, boolean):
3+
Attempted to change method return from @NonNull to @Nullable: incompatible change for method androidx.core.app.PendingIntentCompat.getBroadcast(android.content.Context,int,android.content.Intent,int,boolean)

core/core/api/restricted_current.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -963,7 +963,7 @@ package androidx.core.app {
963963
method public static android.app.PendingIntent getActivities(android.content.Context, int, android.content.Intent![], int, boolean);
964964
method public static android.app.PendingIntent getActivity(android.content.Context, int, android.content.Intent, int, boolean);
965965
method public static android.app.PendingIntent getActivity(android.content.Context, int, android.content.Intent, int, android.os.Bundle, boolean);
966-
method public static android.app.PendingIntent getBroadcast(android.content.Context, int, android.content.Intent, int, boolean);
966+
method public static android.app.PendingIntent? getBroadcast(android.content.Context, int, android.content.Intent, int, boolean);
967967
method @RequiresApi(26) public static android.app.PendingIntent getForegroundService(android.content.Context, int, android.content.Intent, int, boolean);
968968
method public static android.app.PendingIntent getService(android.content.Context, int, android.content.Intent, int, boolean);
969969
}

core/core/src/main/java/androidx/core/app/PendingIntentCompat.java

+7-3
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import androidx.annotation.DoNotInline;
3030
import androidx.annotation.IntDef;
3131
import androidx.annotation.NonNull;
32+
import androidx.annotation.Nullable;
3233
import androidx.annotation.RequiresApi;
3334
import androidx.annotation.RestrictTo;
3435

@@ -135,10 +136,13 @@ public final class PendingIntentCompat {
135136
/**
136137
* Retrieves a {@link PendingIntent} with mandatory mutability flag set on supported platform
137138
* versions. The caller provides the flag as combination of all the other values except
138-
* mutability flag. This method combines mutability flag when necessary. See {@link
139-
* PendingIntent#getBroadcast(Context, int, Intent, int)}.
139+
* mutability flag. This method combines mutability flag when necessary.
140+
*
141+
* @return Returns an existing or new PendingIntent matching the given parameters. May return
142+
* {@code null} only if {@link PendingIntent#FLAG_NO_CREATE} has been supplied.
143+
* @see PendingIntent#getBroadcast(Context, int, Intent, int)
140144
*/
141-
public static @NonNull PendingIntent getBroadcast(
145+
public static @Nullable PendingIntent getBroadcast(
142146
@NonNull Context context,
143147
int requestCode,
144148
@NonNull Intent intent,

0 commit comments

Comments
 (0)