| commit | 04dd2e4f9b079e73f7e5069c0837483482b74034 | [log] [tgz] |
|---|---|---|
| author | Ryan Savitski <rsavitski@google.com> | Thu Jun 10 15:59:37 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jun 10 15:59:37 2021 +0000 |
| tree | 89d2625bf3885ab8e6b7c7ea5534eb42d15d288b | |
| parent | ad9addd59054ec4279f01f99cb52a6029dad7327 [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: Ia57de8ee289f2cef2af64fe0bdeff5c99aef12d5
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;