diff options
| author | Jeff Sharkey <jsharkey@google.com> | 2021-06-15 21:36:59 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-06-15 21:36:59 +0000 |
| commit | 7084489ea9ff720933fb4056069d4be9d1daee85 (patch) | |
| tree | 23c33b4055daa7be99bea8c4087772ec806beabe /core/java | |
| parent | fcd090765290dc2c7a0e8a578cc10a7d05b8ae03 (diff) | |
| parent | a56beb126de2cfa475d618b1042b7f885aa92bd9 (diff) | |
Merge "Revert "HULK SMASH! We've gotta declare REL."" into sc-dev am: a56beb126d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14973563
Change-Id: Ieae4615f2d4f3cfc17838bd8a5cb7b0e9a08cdad
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/app/PendingIntent.java | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/core/java/android/app/PendingIntent.java b/core/java/android/app/PendingIntent.java index e68eb7471e42..0136a35e3975 100644 --- a/core/java/android/app/PendingIntent.java +++ b/core/java/android/app/PendingIntent.java @@ -365,7 +365,6 @@ public final class PendingIntent implements Parcelable { } if (Compatibility.isChangeEnabled(PENDING_INTENT_EXPLICIT_MUTABILITY_REQUIRED) - && !"com.google.android.apps.gcs".equals(packageName) && !flagImmutableSet && !flagMutableSet) { String msg = packageName + ": Targeting S+ (version " + Build.VERSION_CODES.S + " and above) requires that one of FLAG_IMMUTABLE or FLAG_MUTABLE" |