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

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

Merge "Suppress more error prone warnings that are false positives"

parents 3a838943 9295e471

core/java/android/app/PendingIntent.java

+2 −0
Original line number Diff line number Diff line
@@ -397,6 +397,7 @@ public final class PendingIntent implements Parcelable { 
     * parameters.  May return null only if {@link #FLAG_NO_CREATE} has been

     * supplied.

     */

    @SuppressWarnings("AndroidFrameworkPendingIntentMutability")

    public static PendingIntent getActivity(Context context, int requestCode,

            @NonNull Intent intent, @Flags int flags, @Nullable Bundle options) {

        // Some tests only mock Context.getUserId(), so fallback to the id Context.getUser() is null
@@ -528,6 +529,7 @@ public final class PendingIntent implements Parcelable { 
     * parameters.  May return null only if {@link #FLAG_NO_CREATE} has been

     * supplied.

     */

    @SuppressWarnings("AndroidFrameworkPendingIntentMutability")

    public static PendingIntent getActivities(Context context, int requestCode,

            @NonNull Intent[] intents, @Flags int flags, @Nullable Bundle options) {

        // Some tests only mock Context.getUserId(), so fallback to the id Context.getUser() is null