commit dd12e9c10457665160bf01b12791568942a12dc7
author Ashwini Oruganti <ashfall@google.com> Mon Oct 05 11:50:03 2020 -0700
committer Ashwini Oruganti <ashfall@google.com> Wed Jan 06 03:03:40 2021 +0000
tree 24936f3568e0ada86e0b3b7d9d69cd4d82549690
parent 6f0fe217c2c6df0676b3bad827962b1d86e25947

Enforce that a PendingIntent has an explicit mutability
flag on creation.

This was previously a log.e, this change enforces this requirement.
See go/immutable-pendingintents for more context.

Bug: 160794467
Test: atest PendingIntentTest
Change-Id: If49be614125d7ac7eb556559ff32016f41beaef8

core/java/android/app/PendingIntent.java

diff --git a/core/java/android/app/PendingIntent.java b/core/java/android/app/PendingIntent.java
index 9dbf1ff6..b8b9d9f 100644
--- a/core/java/android/app/PendingIntent.java
+++ b/core/java/android/app/PendingIntent.java
@@ -352,7 +352,9 @@
 
         if (Compatibility.isChangeEnabled(PENDING_INTENT_EXPLICIT_MUTABILITY_REQUIRED)
                 && !flagImmutableSet && !flagMutableSet) {
-            Log.e(TAG, msg);
+            Log.wtf(TAG, msg);
+            throw new IllegalArgumentException(
+                "Please specify an explicit mutability flag (FLAG_IMMUTABLE or FLAG_MUTABLE)");
         }
     }