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

Commit 7084489e authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: Ieae4615f2d4f3cfc17838bd8a5cb7b0e9a08cdad
parents fcd09076 a56beb12

core/java/android/app/PendingIntent.java

+0 −1
Original line number Diff line number Diff line
@@ -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"