From 0cbccf9e012655177090f363bd3e84dd79aedaab Mon Sep 17 00:00:00 2001
From: Ashwini Oruganti <ashfall@google.com>
Date: Tue, 9 Mar 2021 09:24:02 -0800
Subject: [PATCH] Enforce the PendingIntent mutability flag requirement for
 chrome

Bug: 178065720
Test: manual
Change-Id: Ic78716033fa91f4a16540aab72e3bff73c6391e9
Merged-In: Ic78716033fa91f4a16540aab72e3bff73c6391e9
---
 core/java/android/app/PendingIntent.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/core/java/android/app/PendingIntent.java b/core/java/android/app/PendingIntent.java
index f4b95420154b6..4cf3a8059b3e4 100644
--- a/core/java/android/app/PendingIntent.java
+++ b/core/java/android/app/PendingIntent.java
@@ -379,8 +379,7 @@ public final class PendingIntent implements Parcelable {
         if (Compatibility.isChangeEnabled(PENDING_INTENT_EXPLICIT_MUTABILITY_REQUIRED)
                 && !flagImmutableSet && !flagMutableSet) {
 
-            //TODO(b/178065720) Remove check for chrome and enforce this requirement
-            if (packageName.equals("com.android.chrome") || mInstrumentation.isInstrumenting()) {
+            if (mInstrumentation.isInstrumenting()) {
                 Log.e(TAG, msg);
             } else {
                 throw new IllegalArgumentException(msg);