commit f1370605ae9e076086555c6a074378cd013c862d
author Brad Ebinger <breadley@google.com> Wed May 06 16:18:12 2020 -0700
committer Anis Assi <anisassi@google.com> Tue Jun 30 16:11:08 2020 -0700
tree 1311332d251e01dba30c85882f81460161fffa7c
parent f992b3f3e801e5fca5b040bef34879aa0366954e

Specify the component for the ACTION_SHOW_ECM_EXIT_DIALOG Intent

Specify the component for the ACTION_SHOW_ECM_EXIT_DIALOG intent
so it can not be intercepted by a malicious application and modified.

Bug: 155094269
Test: manually trigger ECBM dialog and exit.
Merged-In: Id5df0b428bd7e24aa11fb9dd4c920d1019f1b389
Change-Id: Id5df0b428bd7e24aa11fb9dd4c920d1019f1b389
(cherry picked from commit 11c41d321d0c2dc3631f37d2f8f3ebc745f454d2)

src/com/android/phone/EmergencyCallbackModeService.java

diff --git a/src/com/android/phone/EmergencyCallbackModeService.java b/src/com/android/phone/EmergencyCallbackModeService.java
index a07f7aa..86f8fe6 100644
--- a/src/com/android/phone/EmergencyCallbackModeService.java
+++ b/src/com/android/phone/EmergencyCallbackModeService.java
@@ -189,8 +189,10 @@
 
         // PendingIntent to launch Emergency Callback Mode Exit activity if the user selects
         // this notification
-        PendingIntent contentIntent = PendingIntent.getActivity(this, 0,
-                new Intent(EmergencyCallbackModeExitDialog.ACTION_SHOW_ECM_EXIT_DIALOG), 0);
+        Intent intent = new Intent(this, EmergencyCallbackModeExitDialog.class);
+        intent.setAction(EmergencyCallbackModeExitDialog.ACTION_SHOW_ECM_EXIT_DIALOG);
+        PendingIntent contentIntent = PendingIntent.getActivity(this, 0, intent,
+                PendingIntent.FLAG_IMMUTABLE);
         builder.setContentIntent(contentIntent);
 
         // Format notification string