commit 4bcbcd16107884b165fee3dc2467f95c099db6aa
author Maarten Derks <maarten@fairphone.com> Tue Sep 28 11:26:55 2021 +0200
committer Maarten Derks <maarten@fairphone.com> Tue Sep 28 11:26:55 2021 +0200
tree 92f2133a953c815b7b550baa7ed7b8fea0862bfe
parent 0f6339598f1f69171ae06956cfa25ae2bfc0bb05
parent 05e3ca270db83a83988fbbd26ae4c9e02bfbf207

Merge branch 'security-aosp-qt-release' into int/10/fp2

* security-aosp-qt-release:
  Forward fix for: Set FLAG_IMMUTABLE flag on FirstScreenBroadcast PendingIntent.
  Set FLAG_IMMUTABLE flag on FirstScreenBroadcast PendingIntent.

Change-Id: I14d8dcb74af126e86b501e99519c24aa5c6cf80d

src/com/android/launcher3/model/FirstScreenBroadcast.java

diff --git a/src/com/android/launcher3/model/FirstScreenBroadcast.java b/src/com/android/launcher3/model/FirstScreenBroadcast.java
index a0b7177..9f3344d 100644
--- a/src/com/android/launcher3/model/FirstScreenBroadcast.java
+++ b/src/com/android/launcher3/model/FirstScreenBroadcast.java
@@ -15,6 +15,9 @@
  */
 package com.android.launcher3.model;
 
+import static android.app.PendingIntent.FLAG_IMMUTABLE;
+import static android.app.PendingIntent.FLAG_ONE_SHOT;
+
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
@@ -145,7 +148,7 @@
                 .putStringArrayListExtra(HOTSEAT_ITEM_EXTRA, new ArrayList<>(hotseatItems))
                 .putStringArrayListExtra(WIDGET_ITEM_EXTRA, new ArrayList<>(widgetItems))
                 .putExtra(VERIFICATION_TOKEN_EXTRA, PendingIntent.getActivity(context, 0,
-                        new Intent(), PendingIntent.FLAG_ONE_SHOT)));
+                        new Intent(), FLAG_ONE_SHOT | FLAG_IMMUTABLE)));
     }
 
     private static String getPackageName(ItemInfo info) {