mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2024-12-14 18:34:30 -05:00
39 lines
1.8 KiB
Diff
39 lines
1.8 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Winson Chung <winsonc@google.com>
|
||
|
|
Date: Wed, 8 Feb 2023 01:04:46 +0000
|
||
|
|
Subject: [PATCH] Only allow NEW_TASK flag when adjusting pending intents
|
||
|
|
|
||
|
|
Bug: 243794108
|
||
|
|
Test: atest CtsSecurityBulletinHostTestCases:android.security.cts.CVE_2023_20918
|
||
|
|
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:c62d2e1021a030f4f0ae5fcfc8fe8e0875fa669f)
|
||
|
|
Merged-In: I5d329beecef1902c36704e93d0bc5cb60d0e2f5b
|
||
|
|
Change-Id: I5d329beecef1902c36704e93d0bc5cb60d0e2f5b
|
||
|
|
---
|
||
|
|
core/java/android/app/ActivityOptions.java | 6 +++++-
|
||
|
|
1 file changed, 5 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/core/java/android/app/ActivityOptions.java b/core/java/android/app/ActivityOptions.java
|
||
|
|
index 36ab62aedc09..c8f54fd275ee 100644
|
||
|
|
--- a/core/java/android/app/ActivityOptions.java
|
||
|
|
+++ b/core/java/android/app/ActivityOptions.java
|
||
|
|
@@ -20,6 +20,8 @@ import static android.Manifest.permission.CONTROL_REMOTE_APP_TRANSITION_ANIMATIO
|
||
|
|
import static android.app.ActivityTaskManager.SPLIT_SCREEN_CREATE_MODE_TOP_OR_LEFT;
|
||
|
|
import static android.app.WindowConfiguration.ACTIVITY_TYPE_UNDEFINED;
|
||
|
|
import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED;
|
||
|
|
+import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
|
||
|
|
+import static android.content.Intent.FLAG_RECEIVER_FOREGROUND;
|
||
|
|
import static android.view.Display.INVALID_DISPLAY;
|
||
|
|
|
||
|
|
import android.annotation.Nullable;
|
||
|
|
@@ -1262,7 +1264,9 @@ public class ActivityOptions extends ComponentOptions {
|
||
|
|
* @hide
|
||
|
|
*/
|
||
|
|
public int getPendingIntentLaunchFlags() {
|
||
|
|
- return mPendingIntentLaunchFlags;
|
||
|
|
+ // b/243794108: Ignore all flags except the new task flag, to be reconsidered in b/254490217
|
||
|
|
+ return mPendingIntentLaunchFlags &
|
||
|
|
+ (FLAG_ACTIVITY_NEW_TASK | FLAG_RECEIVER_FOREGROUND);
|
||
|
|
}
|
||
|
|
|
||
|
|
/**
|