Merge "Revert "HULK SMASH! We've gotta declare REL."" into sc-dev

This commit is contained in:
Jeff Sharkey
2021-06-15 21:03:41 +00:00
committed by Android (Google) Code Review

View File

@@ -365,7 +365,6 @@ public final class PendingIntent implements Parcelable {
} }
if (Compatibility.isChangeEnabled(PENDING_INTENT_EXPLICIT_MUTABILITY_REQUIRED) if (Compatibility.isChangeEnabled(PENDING_INTENT_EXPLICIT_MUTABILITY_REQUIRED)
&& !"com.google.android.apps.gcs".equals(packageName)
&& !flagImmutableSet && !flagMutableSet) { && !flagImmutableSet && !flagMutableSet) {
String msg = packageName + ": Targeting S+ (version " + Build.VERSION_CODES.S String msg = packageName + ": Targeting S+ (version " + Build.VERSION_CODES.S
+ " and above) requires that one of FLAG_IMMUTABLE or FLAG_MUTABLE" + " and above) requires that one of FLAG_IMMUTABLE or FLAG_MUTABLE"