Revert "Set FLAG_IMMUTABLE flag on FirstScreenBroadcast PendingIntent. am: 6a7a7f6bad am: 3c3e3e0737 am: 5785789dc3"
This reverts commit 1d41f93c37a9ecf3cb58b46b2f04f1faf116e5fe.
Reason for revert: Accidental submission
Change-Id: I3adaefa202ccbd027083a8fe1b5df349172de9a6
diff --git a/src/com/android/launcher3/model/FirstScreenBroadcast.java b/src/com/android/launcher3/model/FirstScreenBroadcast.java
index 18ce035..5112304 100644
--- a/src/com/android/launcher3/model/FirstScreenBroadcast.java
+++ b/src/com/android/launcher3/model/FirstScreenBroadcast.java
@@ -15,18 +15,7 @@
*/
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;
@@ -156,7 +145,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(), FLAG_ONE_SHOT | FLAG_IMMUTABLE)));
+ new Intent(), PendingIntent.FLAG_ONE_SHOT)));
}
private static String getPackageName(ItemInfo info) {