PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I212eb6d6b35459087fe894fe057d6a4a4901f674
This commit is contained in:
Jon Miranda
2021-06-09 19:36:09 +00:00
committed by Automerger Merge Worker
parent 8786016e85 5785789dc3
commit 1d41f93c37
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/model/FirstScreenBroadcast.java
+12 -1
View File
@@ -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) {