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: I40aa288800c21763fd59acf25c7951297e7060bd
This commit is contained in:
Jeff Sharkey
2021-06-15 21:36:21 +00:00
committed by Automerger Merge Worker

View File

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