mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2024-07-04 02:21:22 +00:00
42 lines
2.2 KiB
Diff
42 lines
2.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Winson Chung <winsonc@google.com>
|
|
Date: Wed, 11 Jan 2023 18:58:41 +0000
|
|
Subject: [PATCH] Revert "Ensure that only SysUI can override pending intent
|
|
launch flags"
|
|
|
|
This reverts commit c4d3106e347922610f8c554de3ae238175ed393e.
|
|
|
|
Reason for revert: b/264884187, b/264885689
|
|
|
|
Change-Id: I9fb0d66327f3f872a92e6b9d682d58489e81e6ba
|
|
(cherry picked from commit 7bb933f48ff15d8f08d2185005b7b3e212915276)
|
|
Merged-In: I9fb0d66327f3f872a92e6b9d682d58489e81e6ba
|
|
---
|
|
.../com/android/server/am/PendingIntentRecord.java | 11 +++--------
|
|
1 file changed, 3 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/services/core/java/com/android/server/am/PendingIntentRecord.java b/services/core/java/com/android/server/am/PendingIntentRecord.java
|
|
index 44d67ed0d642..54504c3c1e24 100644
|
|
--- a/services/core/java/com/android/server/am/PendingIntentRecord.java
|
|
+++ b/services/core/java/com/android/server/am/PendingIntentRecord.java
|
|
@@ -317,16 +317,11 @@ public final class PendingIntentRecord extends IIntentSender.Stub {
|
|
resolvedType = key.requestResolvedType;
|
|
}
|
|
|
|
- // Apply any launch flags from the ActivityOptions. This is used only by SystemUI
|
|
- // to ensure that we can launch the pending intent with a consistent launch mode even
|
|
- // if the provided PendingIntent is immutable (ie. to force an activity to launch into
|
|
- // a new task, or to launch multiple instances if supported by the app)
|
|
+ // Apply any launch flags from the ActivityOptions. This is to ensure that the caller
|
|
+ // can specify a consistent launch mode even if the PendingIntent is immutable
|
|
final ActivityOptions opts = ActivityOptions.fromBundle(options);
|
|
if (opts != null) {
|
|
- // TODO(b/254490217): Move this check into SafeActivityOptions
|
|
- if (controller.mAtmInternal.isCallerRecents(Binder.getCallingUid())) {
|
|
- finalIntent.addFlags(opts.getPendingIntentLaunchFlags());
|
|
- }
|
|
+ finalIntent.addFlags(opts.getPendingIntentLaunchFlags());
|
|
}
|
|
|
|
// Extract options before clearing calling identity
|