Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 74364b9e authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'android-12.0.0_r26' into staging/lineage-19.0_merge-android-12.0.0_r26 

Android 12.0.0 release 26

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCYdSreAAKCRDorT+BmrEO
# eA1zAJ0ZOZM41bglEggiWaVsmtIEb3pkUACePgFTFP7JGGAj3iKEoLMMfHJRXtQ=
# =D8G3
# -----END PGP SIGNATURE-----
# gpg: Signature made Tue Jan  4 22:18:00 2022 EET
# gpg:                using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [marginal]
# gpg: initial-contribution@android.com: Verified 1020 signatures in the past
#      2 months.  Encrypted 4 messages in the past 3 days.
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 4340 D135 70EF 945E 8381  0964 E8AD 3F81 9AB1 0E78

# By Varun Berry
# Via Android Build Coastguard Worker
* tag 'android-12.0.0_r26':
  Add FLAG_IMMUTABLE to PendingIntent in LegacyModeSmsHandler.

Change-Id: I269602fc372420217cc72de3a6b2b13b9e292f45
parents 2ee37380 15c61f1e

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

+2 −2
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ public class LegacyModeSmsHandler { 
                  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 @@ public class LegacyModeSmsHandler { 
              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);