From ec84daeea1918d881d363cab9be468c8e3f75521 Mon Sep 17 00:00:00 2001 From: Jean-Michel Trivi Date: Thu, 22 Oct 2020 17:12:37 -0700 Subject: [PATCH] AudioManager: PendingIntent for media button is immutable Annotate PendingIntent for media button event receiver as immutable Bug: 170425075 Test: don't crash in december, see bug Change-Id: I6042790fe3a154c67f448962b6ebdcc652978495 --- media/java/android/media/AudioManager.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/media/java/android/media/AudioManager.java b/media/java/android/media/AudioManager.java index 195122db146ae..8b28cc45fda28 100644 --- a/media/java/android/media/AudioManager.java +++ b/media/java/android/media/AudioManager.java @@ -4049,7 +4049,8 @@ public class AudioManager { // the associated intent will be handled by the component being registered mediaButtonIntent.setComponent(eventReceiver); PendingIntent pi = PendingIntent.getBroadcast(getContext(), - 0/*requestCode, ignored*/, mediaButtonIntent, 0/*flags*/); + 0/*requestCode, ignored*/, mediaButtonIntent, + PendingIntent.FLAG_IMMUTABLE); registerMediaButtonIntent(pi, eventReceiver); } @@ -4102,7 +4103,8 @@ public class AudioManager { // the associated intent will be handled by the component being registered mediaButtonIntent.setComponent(eventReceiver); PendingIntent pi = PendingIntent.getBroadcast(getContext(), - 0/*requestCode, ignored*/, mediaButtonIntent, 0/*flags*/); + 0/*requestCode, ignored*/, mediaButtonIntent, + PendingIntent.FLAG_IMMUTABLE); unregisterMediaButtonIntent(pi); }