commit 3c3e3e07370084bcd3362ad249f3d707a3f254f2
author Jon Miranda <jonmiranda@google.com> Wed Jun 09 17:57:36 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jun 09 17:57:36 2021 +0000
tree 9fb346ccf98e19db848f7d871c1a21ca091a3fea
parent 64155533b694ef3b4f45e3365270ca99ec369200
parent 6a7a7f6bad9ddb3b09620b5bd3e931e4a7f94037

Set FLAG_IMMUTABLE flag on FirstScreenBroadcast PendingIntent. am: 6a7a7f6bad

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14651127

Change-Id: I6416a7a9e9639a6881d54314a26fafa2c1ed4cfa

src/com/android/launcher3/model/FirstScreenBroadcast.java

diff --git a/src/com/android/launcher3/model/FirstScreenBroadcast.java b/src/com/android/launcher3/model/FirstScreenBroadcast.java
index 1149b55..b8dbd08 100644
--- a/src/com/android/launcher3/model/FirstScreenBroadcast.java
+++ b/src/com/android/launcher3/model/FirstScreenBroadcast.java
@@ -15,6 +15,15 @@
  */
 package com.android.launcher3.model;
 
+import static android.app.PendingIntent.FLAG_IMMUTABLE;
+import static android.app.PendingIntent.FLAG_ONE_SHOT;
+import static android.os.Process.myUserHandle;
+
+import static com.android.launcher3.pm.InstallSessionHelper.getUserHandle;
+
+import static java.util.stream.Collectors.groupingBy;
+import static java.util.stream.Collectors.mapping;
+
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
@@ -140,7 +149,7 @@
                 .putStringArrayListExtra(HOTSEAT_ITEM_EXTRA, new ArrayList<>(hotseatItems))
                 .putStringArrayListExtra(WIDGET_ITEM_EXTRA, new ArrayList<>(widgetItems))
                 .putExtra(VERIFICATION_TOKEN_EXTRA, PendingIntent.getActivity(context, 0,
-                        new Intent(), PendingIntent.FLAG_ONE_SHOT)));
+                        new Intent(), FLAG_ONE_SHOT | FLAG_IMMUTABLE)));
     }
 
     private static String getPackageName(ItemInfo info) {