Set FLAG_IMMUTABLE flag on FirstScreenBroadcast PendingIntent.
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
diff --git a/src/com/android/launcher3/model/FirstScreenBroadcast.java b/src/com/android/launcher3/model/FirstScreenBroadcast.java
index 18ce035..f9ed2c7 100644
--- a/src/com/android/launcher3/model/FirstScreenBroadcast.java
+++ b/src/com/android/launcher3/model/FirstScreenBroadcast.java
@@ -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;