Merge "Merge "Revert "Revert "Revert "HULK SMASH! We've gotta declare REL."""" into sc-dev am: 83f88bc43a am: 42b5526aa2" into sc-v2-dev-plus-aosp

This commit is contained in:
Automerger Merge Worker
2021-06-16 22:08:28 +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)
&& !"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"