From 67f28e7448d41d6affde43e3f1fcb366cc5cc82f Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Wed, 16 Jun 2021 01:54:35 +0000
Subject: [PATCH] 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
---
 core/java/android/app/PendingIntent.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/java/android/app/PendingIntent.java b/core/java/android/app/PendingIntent.java
index 0136a35e3975b..e68eb7471e420 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"