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

Commit 62c12ffd 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

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



Change-Id: Ic7d4a98b4c83a84b73eb34180a9318fc53a116ed
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5603eb78 b34c8422

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;