commit 7fa6f8bca8f1a7f29d8b397360c30f1254af4b54
author Shuo Qian <shuoq@google.com> Mon May 11 17:23:41 2020 -0700
committer Anis Assi <anisassi@google.com> Tue Jun 30 16:10:18 2020 -0700
tree 9b27cf1a241a71da870761c6faf2b14ac1435417
parent 68d747e6ec7334b4c69e1f6cdc94170f7542e8fe

Use FLAG_IMMUTABLE for CarrierServiceStateTracker

Require that the PendingIntent be immutable so that a malicious app is
 not able to hijack and mutate any of the details.

Test: Android builds
Bug: 155094269
Change-Id: Iea9ec6451170e592dc72c035d6eec7b80150ddd4
Merged-In: Iea9ec6451170e592dc72c035d6eec7b80150ddd4
(cherry picked from commit 89763569eacb10c4043d8937c948130b1f816e79)

src/java/com/android/internal/telephony/CarrierServiceStateTracker.java

diff --git a/src/java/com/android/internal/telephony/CarrierServiceStateTracker.java b/src/java/com/android/internal/telephony/CarrierServiceStateTracker.java
index 77a39eb..d5fceb2 100644
--- a/src/java/com/android/internal/telephony/CarrierServiceStateTracker.java
+++ b/src/java/com/android/internal/telephony/CarrierServiceStateTracker.java
@@ -326,7 +326,7 @@
             Context context = mPhone.getContext();
             Intent notificationIntent = new Intent(Settings.ACTION_DATA_ROAMING_SETTINGS);
             PendingIntent settingsIntent = PendingIntent.getActivity(context, 0, notificationIntent,
-                    PendingIntent.FLAG_ONE_SHOT);
+                    PendingIntent.FLAG_ONE_SHOT | PendingIntent.FLAG_IMMUTABLE);
             CharSequence title = context.getText(
                     com.android.internal.R.string.NetworkPreferenceSwitchTitle);
             CharSequence details = context.getText(