summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Chris Tate <ctate@android.com> 2020-10-06 16:43:00 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2020-10-06 16:43:00 +0000
commit416332cf90cdba9ba2664ac5800a2ee7c29257a7 (patch)
tree6e2fa18d0769dc02ad18ca905a35e0cc494b6d10
parent4cab9c38764a6123c0072f0ef7b007cc29cd1b74 (diff)
parenta839692d5ca4ea47e9565865eae5cdf904cc0629 (diff)
Merge "Make WallpaperMS bind wallpaper component PendingIntent immutable." into pi-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 f66918789dd4..1d634d3d760c 100644
--- a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
+++ b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
@@ -2373,7 +2373,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,