commit 795bba22ad35605017e01a30aebfbce49367d644
author Maarten Derks <maarten@fairphone.com> Wed Dec 08 12:11:17 2021 +0100
committer Maarten Derks <maarten@fairphone.com> Wed Dec 08 12:11:17 2021 +0100
tree 675c194cf0f09c59dd2cea3aba9765c40c81eca1
parent 8087bd9e23ebbd9597cbac8e0a82e895a0a330e2
parent 2b95a978ee219545e6ab6049a1d7597d0407689c

Merge branch 'security-aosp-pi-release' into int/p/fp2

* security-aosp-pi-release:
  Add FLAG_IMMUTABLE to PendingIntent in LegacyModeSmsHandler.

Change-Id: I4382c7abb1120adef40260c354ebe8a039cdf996

java/com/android/voicemail/impl/sms/LegacyModeSmsHandler.java

diff --git a/java/com/android/voicemail/impl/sms/LegacyModeSmsHandler.java b/java/com/android/voicemail/impl/sms/LegacyModeSmsHandler.java
index 3608c36..c36b75e 100644
--- a/java/com/android/voicemail/impl/sms/LegacyModeSmsHandler.java
+++ b/java/com/android/voicemail/impl/sms/LegacyModeSmsHandler.java
@@ -99,7 +99,7 @@
                   context,
                   CallIntentBuilder.forVoicemail(
                       phoneAccountHandle, CallInitiationType.Type.LEGACY_VOICEMAIL_NOTIFICATION)),
-              PendingIntent.FLAG_UPDATE_CURRENT);
+              PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
     } else {
       Intent launchVoicemailSettingsIntent =
           new Intent(TelephonyManager.ACTION_CONFIGURE_VOICEMAIL);
@@ -112,7 +112,7 @@
               context,
               LAUNCH_VOICEMAIL_SETTINGS_REQUEST_CODE,
               launchVoicemailSettingsIntent,
-              PendingIntent.FLAG_UPDATE_CURRENT);
+              PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
     }
 
     intent.putExtra(TelephonyManager.EXTRA_VOICEMAIL_NUMBER, voicemailNumber);