Merge the 2021-09-05 SPL branch from AOSP-Partner
* security-aosp-pi-release:
Forward fix for: Set FLAG_IMMUTABLE flag on FirstScreenBroadcast PendingIntent.
Set FLAG_IMMUTABLE flag on FirstScreenBroadcast PendingIntent.
Change-Id: I450c647630378b8c2de21cdb3bb4b354b491233a
diff --git a/src/com/android/launcher3/model/FirstScreenBroadcast.java b/src/com/android/launcher3/model/FirstScreenBroadcast.java
index 1149b55..4d017bd 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;
@@ -140,7 +143,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) {