Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d8d46140 authored by Colin Cross's avatar Colin Cross Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14991077

Change-Id: Ib6d5ba46ada533cbb903c52eb3531f6a854d4236
parents 63523898 5c80e349
Loading
Loading
Loading
Loading
+1 −0
Original line number Original line Diff line number Diff line
@@ -365,6 +365,7 @@ 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"