From ea92f4eb5ea36bfac668c71206553b08f9d939f4 Mon Sep 17 00:00:00 2001 From: Yi-Ling Chuang Date: Tue, 3 Nov 2020 17:35:49 +0800 Subject: [PATCH] Add the mutability flag to the pendingIntent. Starting Android S, PendingIntent should have a explicit mutability flag to avoid vulnerability. Fixes: 172207853 Test: 1. Make AdaptiveSleepSlice available on the homepage and click on it. 2. Play with the volume panel. Change-Id: I9cd428b17f44f5215d8c06331d12a17f997ca557 --- .../contextualcards/slices/ContextualAdaptiveSleepSlice.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/homepage/contextualcards/slices/ContextualAdaptiveSleepSlice.java b/src/com/android/settings/homepage/contextualcards/slices/ContextualAdaptiveSleepSlice.java index a6170d819cd..f11b0e3f8d2 100644 --- a/src/com/android/settings/homepage/contextualcards/slices/ContextualAdaptiveSleepSlice.java +++ b/src/com/android/settings/homepage/contextualcards/slices/ContextualAdaptiveSleepSlice.java @@ -43,6 +43,7 @@ import com.google.common.annotations.VisibleForTesting; import java.util.concurrent.TimeUnit; +// TODO(b/172310863): consider removing this slice. public class ContextualAdaptiveSleepSlice implements CustomSliceable { private static final String TAG = "ContextualAdaptiveSleepSlice"; private static final long DEFAULT_SETUP_TIME = 0; @@ -122,7 +123,8 @@ public class ContextualAdaptiveSleepSlice implements CustomSliceable { private PendingIntent getPrimaryAction() { final Intent intent = getIntent(); - return PendingIntent.getActivity(mContext, 0 /* requestCode */, intent, 0 /* flags */); + return PendingIntent.getActivity(mContext, 0 /* requestCode */, intent, + PendingIntent.FLAG_IMMUTABLE /* flags */); } /**