Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1d41f93c authored by Jon Miranda's avatar Jon Miranda Committed by Automerger Merge Worker
Browse files

Set FLAG_IMMUTABLE flag on FirstScreenBroadcast PendingIntent. am: 6a7a7f6b...

Set FLAG_IMMUTABLE flag on FirstScreenBroadcast PendingIntent. am: 6a7a7f6b am: 3c3e3e07 am: 5785789d

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

Change-Id: I212eb6d6b35459087fe894fe057d6a4a4901f674
parents 8786016e 5785789d
Loading
Loading
Loading
Loading
+12 −1
Original line number Diff line number Diff line
@@ -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 @@ public class FirstScreenBroadcast {
                .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) {