aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-03-01 08:16:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Set FLAG_IMMUTABLE flag on FirstScreenBroadcast PendingIntent.

Browse Source 
Fixing build by getting rid of the erroneously merged conflict markers,
and applying the end state of ag/14651125.

Bug: 183927137
Merged-In: I881a2b79462e8d420b3dcb6a6b98adbe9e8e0394
Change-Id: I70acd4ce48853be728be1fb80b4b885d00a059a9
This commit is contained in:
Ryan Savitski
2021-06-10 15:39:36 +01:00
parent b1b76c34f5
commit 5af0edefdb
1 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/launcher3/model/FirstScreenBroadcast.java
View File

@@ -15,19 +15,10 @@
*/
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;
import android.content.Intent;