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

Commit 48acfb0f authored by Winson Chung's avatar Winson Chung Committed by Android (Google) Code Review
Browse files

Revert "Ensure that only SysUI can override pending intent launch flags" 

This reverts commit c4d3106e.

Reason for revert: b/264884187, b/264885689 

Change-Id: I9fb0d66327f3f872a92e6b9d682d58489e81e6ba
parent c4d3106e

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

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