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

This commit is contained in:
TreeHugger Robot
2020-10-26 21:16:49 +00:00
committed by Android (Google) Code Review

View File

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