commit 016ea8a0280d2c1d213c049645212b57ae2918ab
author Wei Sheng Shih <wilsonshih@google.com> Thu May 14 02:16:28 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu May 14 02:16:28 2020 +0000
tree 660652472a25480f85eb7b4e1ee29ba1c3dd9f1b
parent 4bf8746b40268df134016b5ea2d66efc9595e105
parent d4bd69cef05d379555418a8fe748ec94ff6bd6d0

Merge "Make WallpaperMS bind wallpaper component PendingIntent immutable." into rvc-dev

services/core/java/com/android/server/wallpaper/WallpaperManagerService.java

diff --git a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
index 63952b0..31fbaff 100644
--- a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
+++ b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
@@ -2743,7 +2743,7 @@
                     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