Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Ensure that only SysUI can override pending intent launch flags"" into qt-dev

Browse Source
This commit is contained in:
Winson Chung
2023-01-21 05:01:52 +00:00
committed by Android (Google) Code Review
parent 1d1446d53b 48acfb0f1d
commit e6ffbc91fb
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
services/core/java/com/android/server/am/PendingIntentRecord.java
View File

@@ -317,16 +317,11 @@ public final class PendingIntentRecord extends IIntentSender.Stub {
resolvedType = key.requestResolvedType; resolvedType = key.requestResolvedType;
} }
// Apply any launch flags from the ActivityOptions. This is used only by SystemUI // Apply any launch flags from the ActivityOptions. This is to ensure that the caller
// to ensure that we can launch the pending intent with a consistent launch mode even // can specify a consistent launch mode even if the PendingIntent is immutable
// 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)
final ActivityOptions opts = ActivityOptions.fromBundle(options); final ActivityOptions opts = ActivityOptions.fromBundle(options);
if (opts != null) { if (opts != null) {
// TODO(b/254490217): Move this check into SafeActivityOptions finalIntent.addFlags(opts.getPendingIntentLaunchFlags());
if (controller.mAtmInternal.isCallerRecents(Binder.getCallingUid())) {
finalIntent.addFlags(opts.getPendingIntentLaunchFlags());
}
} }
// Extract options before clearing calling identity // Extract options before clearing calling identity