aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2021-03-13 02:08:21 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2021-03-13 02:08:21 +0000
commite133fc59fbef0671adaf45bc63d48bdf7ba864ed (patch)
treefefe04069e307b56c7907676c98b2017ac14232b
parent986539f9628c9b6131b80f8909f84325b350dbb2 (diff)
parent20022aae9a24b50c391daf0cda2c7f6516d6c329 (diff)
downloadtests-e133fc59fbef0671adaf45bc63d48bdf7ba864ed.tar.gz
Snap for 7205268 from 20022aae9a24b50c391daf0cda2c7f6516d6c329 to sc-v2-release
Change-Id: I591cf8bf0f995affffe6fc7c9cde1ff1e8f10cae
-rw-r--r--TestMediaApp/src/com/android/car/media/testmediaapp/TmaForegroundService.java2
-rw-r--r--TestMediaApp/src/com/android/car/media/testmediaapp/TmaPlayer.java3
2 files changed, 3 insertions, 2 deletions
diff --git a/TestMediaApp/src/com/android/car/media/testmediaapp/TmaForegroundService.java b/TestMediaApp/src/com/android/car/media/testmediaapp/TmaForegroundService.java
index 6241455..594cbab 100644
--- a/TestMediaApp/src/com/android/car/media/testmediaapp/TmaForegroundService.java
+++ b/TestMediaApp/src/com/android/car/media/testmediaapp/TmaForegroundService.java
@@ -58,7 +58,7 @@ public class TmaForegroundService extends Service {
createNotificationChannel();
Intent notificationIntent = new Intent(this, TmaPrefsActivity.class);
PendingIntent pendingIntent = PendingIntent.getActivity(this,
- 0, notificationIntent, 0);
+ 0, notificationIntent, PendingIntent.FLAG_IMMUTABLE);
Notification notification = new NotificationCompat.Builder(this, CHANNEL_ID)
.setContentTitle("Foreground Service")
.setSmallIcon(R.drawable.ic_app_icon)
diff --git a/TestMediaApp/src/com/android/car/media/testmediaapp/TmaPlayer.java b/TestMediaApp/src/com/android/car/media/testmediaapp/TmaPlayer.java
index 43cf3af..e75d028 100644
--- a/TestMediaApp/src/com/android/car/media/testmediaapp/TmaPlayer.java
+++ b/TestMediaApp/src/com/android/car/media/testmediaapp/TmaPlayer.java
@@ -103,7 +103,8 @@ public class TmaPlayer extends MediaSessionCompat.Callback {
Intent prefsIntent = new Intent();
prefsIntent.setClass(mBrowser, TmaPrefsActivity.class);
prefsIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
- PendingIntent pendingIntent = PendingIntent.getActivity(mBrowser, 0, prefsIntent, 0);
+ PendingIntent pendingIntent = PendingIntent.getActivity(mBrowser, 0, prefsIntent,
+ PendingIntent.FLAG_IMMUTABLE);
Bundle extras = new Bundle();
extras.putString(MediaKeys.ERROR_RESOLUTION_ACTION_LABEL, event.mActionLabel);