From ecd15ed9a95812763540074db29c844a8dbe22eb Mon Sep 17 00:00:00 2001 From: Ashwini Oruganti Date: Wed, 14 Oct 2020 12:26:09 -0700 Subject: [PATCH] Suppress one off errorprone warnings for AndroidFrameworkPendingIntentMutability These are essentially false positives that are just taking the flags in as an argument and passing that over to PendingIntent methods. This change should clear up the noise. Bug: 160794467 Test: Errorprone builds should no longer show these as violations Exempt-From-Owner-Approval: Trivial warning suppression Change-Id: I8ae309fd53140718d41f4d3b94f92e111cdd8955 --- core/java/android/app/PendingIntent.java | 3 +++ core/java/android/app/TaskStackBuilder.java | 2 ++ .../server/accessibility/AccessibilityManagerService.java | 1 + 3 files changed, 6 insertions(+) diff --git a/core/java/android/app/PendingIntent.java b/core/java/android/app/PendingIntent.java index e8937a8da9116..8054cdb780eb7 100644 --- a/core/java/android/app/PendingIntent.java +++ b/core/java/android/app/PendingIntent.java @@ -363,6 +363,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, Intent intent, @Flags int flags) { return getActivity(context, requestCode, intent, flags, null); @@ -489,6 +490,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) { return getActivities(context, requestCode, intents, flags, null); @@ -611,6 +613,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 getBroadcast(Context context, int requestCode, Intent intent, @Flags int flags) { return getBroadcastAsUser(context, requestCode, intent, flags, context.getUser()); diff --git a/core/java/android/app/TaskStackBuilder.java b/core/java/android/app/TaskStackBuilder.java index b99b32748dcd3..e23804668d8de 100644 --- a/core/java/android/app/TaskStackBuilder.java +++ b/core/java/android/app/TaskStackBuilder.java @@ -264,6 +264,7 @@ public class TaskStackBuilder { * * @return The obtained PendingIntent */ + @SuppressWarnings("AndroidFrameworkPendingIntentMutability") public PendingIntent getPendingIntent(int requestCode, @PendingIntent.Flags int flags, Bundle options) { if (mIntents.isEmpty()) { @@ -278,6 +279,7 @@ public class TaskStackBuilder { /** * @hide */ + @SuppressWarnings("AndroidFrameworkPendingIntentMutability") public PendingIntent getPendingIntent(int requestCode, int flags, Bundle options, UserHandle user) { if (mIntents.isEmpty()) { diff --git a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java index ae33f0c3da9cd..671f879f348aa 100644 --- a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java +++ b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java @@ -2624,6 +2624,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub } @Override + @SuppressWarnings("AndroidFrameworkPendingIntentMutability") public PendingIntent getPendingIntentActivity(Context context, int requestCode, Intent intent, int flags) { return PendingIntent.getActivity(context, requestCode, intent, flags);