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

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

Browse Source 
This reverts commit 1d41f93c37.

Reason for revert: Accidental submission

Change-Id: I3adaefa202ccbd027083a8fe1b5df349172de9a6
This commit is contained in:
Alex Spradlin
2021-06-09 19:44:31 +00:00
parent 1d41f93c37
commit 1aa95b8400
1 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/model/FirstScreenBroadcast.java
+1 -12
View File
@@ -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 @@ 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(), FLAG_ONE_SHOT | FLAG_IMMUTABLE)));
new Intent(), PendingIntent.FLAG_ONE_SHOT)));
}
private static String getPackageName(ItemInfo info) {