| commit | 5bd2f65258b7a6a04206b4ad93f9c68cdcdcfdde | [log] [tgz] |
|---|---|---|
| author | Ryan Savitski <rsavitski@google.com> | Thu Jun 10 16:00:06 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jun 10 16:00:06 2021 +0000 |
| tree | 31782653ed0605cce0450f7ca04e85103a3455e7 | |
| parent | 55e7fc68412543a6814273901144d724e2aaf56a [diff] | |
| parent | 5af0edefdb1f1b86f2d3112a7394c04324e79d74 [diff] |
Set FLAG_IMMUTABLE flag on FirstScreenBroadcast PendingIntent. am: 5af0edefdb Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14936971 Change-Id: I4259af112c4c59f4537fe785982369b9937525bd
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;