From abc350e0f90cffb94ce0b3c3e27b489db7e35e09 Mon Sep 17 00:00:00 2001 From: Ashwini Oruganti Date: Thu, 21 Jan 2021 09:00:11 -0800 Subject: [PATCH] Temporarily relax the PI mutability flag requirement for chrome Bug: 178065720 Test: chrome doesn't crash for missing PI mutability flag Change-Id: I7d1ba664687f3fe0a99591994d46679812089364 --- core/java/android/app/PendingIntent.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/core/java/android/app/PendingIntent.java b/core/java/android/app/PendingIntent.java index b055c6768e7ba..6d75d0fe020a1 100644 --- a/core/java/android/app/PendingIntent.java +++ b/core/java/android/app/PendingIntent.java @@ -359,10 +359,12 @@ public final class PendingIntent implements Parcelable { if (Compatibility.isChangeEnabled(PENDING_INTENT_EXPLICIT_MUTABILITY_REQUIRED) && !flagImmutableSet && !flagMutableSet) { - if (!mInstrumentation.isInstrumenting()) { - throw new IllegalArgumentException(msg); - } else { + + //TODO(b/178065720) Remove check for chrome and enforce this requirement + if (packageName.equals("com.android.chrome") || mInstrumentation.isInstrumenting()) { Log.e(TAG, msg); + } else { + throw new IllegalArgumentException(msg); } } }