summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Chris Tate <ctate@android.com> 2020-10-06 16:42:48 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2020-10-06 16:42:48 +0000
commit985f7b1d532d230866b5ae45ca30548fd0800dba (patch)
tree47fe1362975d916faa4df29f614fc0398ad189c9
parentb3069d3806d9ef589050c509c49f5c3f703008a5 (diff)
parent3c21166a2746d8dfa152dc9f5c90f8d6078e378d (diff)
Merge "Make WallpaperMS bind wallpaper component PendingIntent immutable." into qt-qpr1-dev
-rw-r--r--services/core/java/com/android/server/wallpaper/WallpaperManagerService.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
index 0e2f0ce991c7..37ae3340d319 100644
--- a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
+++ b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
@@ -2709,7 +2709,7 @@ public class WallpaperManagerService extends IWallpaperManager.Stub
mContext, 0,
Intent.createChooser(new Intent(Intent.ACTION_SET_WALLPAPER),
mContext.getText(com.android.internal.R.string.chooser_wallpaper)),
- 0, null, new UserHandle(serviceUserId)));
+ PendingIntent.FLAG_IMMUTABLE, null, new UserHandle(serviceUserId)));
if (!mContext.bindServiceAsUser(intent, newConn,
Context.BIND_AUTO_CREATE | Context.BIND_SHOWING_UI
| Context.BIND_FOREGROUND_SERVICE_WHILE_AWAKE