summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Colin Cross <ccross@android.com> 2021-06-16 01:54:35 +0000
committer Colin Cross <ccross@android.com> 2021-06-16 01:54:59 +0000
commit67f28e7448d41d6affde43e3f1fcb366cc5cc82f (patch)
treeb215f63f3527b609b079c392d5168b248bdd10b8
parent30bb1d09eb43bc2cc321f99621423ca253a7b6d4 (diff)
Revert "Revert "HULK SMASH! We've gotta declare REL.""
This reverts commit 30bb1d09eb43bc2cc321f99621423ca253a7b6d4. Reason for revert: b/191191441 Bug: 171506470 Bug: 191191441 Change-Id: I698709a27f3b09e5e02143efd7a71157b5ecf75a
-rw-r--r--core/java/android/app/PendingIntent.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/java/android/app/PendingIntent.java b/core/java/android/app/PendingIntent.java
index 0136a35e3975..e68eb7471e42 100644
--- a/core/java/android/app/PendingIntent.java
+++ b/core/java/android/app/PendingIntent.java
@@ -365,6 +365,7 @@ 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"