Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 29eb265f authored by Winson Chung's avatar Winson Chung Committed by Automerger Merge Worker
Browse files

Merge "Revert "Ensure that only SysUI can override pending intent launch... 

Merge "Revert "Ensure that only SysUI can override pending intent launch flags"" into qt-dev am: e6ffbc91 am: b34c8422 am: 62c12ffd

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20946190



Change-Id: I0c21f4aba87465d956f3179aa28393affda29318
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 421799ac 62c12ffd

services/core/java/com/android/server/am/PendingIntentRecord.java

+3 −8
Original line number Diff line number Diff line
@@ -345,17 +345,12 @@ 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());

            }

            }



            // Extract options before clearing calling identity

            mergedOptions = key.options;