commit 28aee1f60df7ef452fdb59db24f116ed1e0bdaa3
author Bill Yi <byi@google.com> Thu Jan 06 18:28:03 2022 -0800
committer Bill Yi <byi@google.com> Thu Jan 06 18:28:03 2022 -0800
tree 8874bbc57a0c2c357ea6b471e87689e8a56c8bcd
parent aead98d42d84c560d5306f519ab21c1d5a3a12c7
parent 15c61f1ebd7245ed045ea04b245cbf5b0b125579

Merge sc-qpr1 to aosp-master - DO NOT MERGE

Merged-In: I50dd8d3869944602e05492aaf3d4b9501676067f
Merged-In: I4a6c3d388057645a1e36c975352dacca83c1bddc
Change-Id: Ia657402465eb9e33ac4712d6439add755f3171f6

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 29d376b..4e82722 100644
--- a/java/com/android/voicemail/impl/sms/LegacyModeSmsHandler.java
+++ b/java/com/android/voicemail/impl/sms/LegacyModeSmsHandler.java
@@ -109,7 +109,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);
@@ -122,7 +122,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);