commit d997f9957d49fe425aa02000cf45b3876e367035
author Jon Miranda <jonmiranda@google.com> Wed Jun 09 19:58:34 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jun 09 19:58:34 2021 +0000
tree 0c8ab1383a1f29c5a9fba2591e8deb4c1fe7d07c
parent 18217e7f94b221907a9454510d95ec2c0ca114d8
parent 1d41f93c37a9ecf3cb58b46b2f04f1faf116e5fe

Set FLAG_IMMUTABLE flag on FirstScreenBroadcast PendingIntent. am: 6a7a7f6bad am: 3c3e3e0737 am: 5785789dc3 am: 1d41f93c37

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

Change-Id: I0b07eb2d2a7838d35f3b70e8059daa3d483bc267

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 5112304..18ce035 100644
--- a/src/com/android/launcher3/model/FirstScreenBroadcast.java
+++ b/src/com/android/launcher3/model/FirstScreenBroadcast.java
@@ -15,7 +15,18 @@
  */
 package com.android.launcher3.model;
 
+<<<<<<< TARGET BRANCH (878601 Block recent work profile apps content capture)
 import static android.os.Process.myUserHandle;
+=======
+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;
+>>>>>>> SOURCE BRANCH (578578 Set FLAG_IMMUTABLE flag on FirstScreenBroadcast PendingInten)
 
 import android.app.PendingIntent;
 import android.content.Context;
@@ -145,7 +156,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) {