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

Commit dd9b8095 authored by Nan Wu's avatar Nan Wu Committed by Automerger Merge Worker
Browse files

Merge "PendingIntent creator/sender BAL options" into udc-qpr-dev am: 0d05f726 am: 5b2b055e 

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



Change-Id: Id93820b5386f4548dee568ddfde3c44536a2bfa2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c217f7fa 5b2b055e

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

+14 −1
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import static com.android.server.am.ActivityManagerDebugConfig.TAG_WITH_CLASS_NA 
import android.annotation.Nullable;

import android.app.Activity;

import android.app.ActivityManagerInternal;

import android.app.ActivityOptions;

import android.app.AppGlobals;

import android.app.PendingIntent;

import android.app.PendingIntentStats;
@@ -126,6 +127,18 @@ public class PendingIntentController { 
                }

            }

            Bundle.setDefusable(bOptions, true);

            ActivityOptions opts = ActivityOptions.fromBundle(bOptions);

            if (opts != null && opts.getPendingIntentBackgroundActivityStartMode()

                    != ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_SYSTEM_DEFINED) {

                Slog.wtf(TAG, "Resetting option setPendingIntentBackgroundActivityStartMode("

                        + opts.getPendingIntentBackgroundActivityStartMode()

                        + ") to SYSTEM_DEFINED from the options provided by the pending "

                        + "intent creator ("

                        + packageName

                        + ") because this option is meant for the pending intent sender");

                opts.setPendingIntentBackgroundActivityStartMode(

                        ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_SYSTEM_DEFINED);

            }



            final boolean noCreate = (flags & PendingIntent.FLAG_NO_CREATE) != 0;

            final boolean cancelCurrent = (flags & PendingIntent.FLAG_CANCEL_CURRENT) != 0;
@@ -135,7 +148,7 @@ public class PendingIntentController { 


            PendingIntentRecord.Key key = new PendingIntentRecord.Key(type, packageName, featureId,

                    token, resultWho, requestCode, intents, resolvedTypes, flags,

                    SafeActivityOptions.fromBundle(bOptions), userId);

                    new SafeActivityOptions(opts), userId);

            WeakReference<PendingIntentRecord> ref;

            ref = mIntentSenderRecords.get(key);

            PendingIntentRecord rec = ref != null ? ref.get() : null;

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

+14 −0
Original line number Diff line number Diff line
@@ -456,6 +456,20 @@ public final class PendingIntentRecord extends IIntentSender.Stub { 
            // can specify a consistent launch mode even if the PendingIntent is immutable

            final ActivityOptions opts = ActivityOptions.fromBundle(options);

            if (opts != null) {

                if (opts.getPendingIntentCreatorBackgroundActivityStartMode()

                        != ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_SYSTEM_DEFINED) {

                    Slog.wtf(TAG,

                            "Resetting option "

                                    + "setPendingIntentCreatorBackgroundActivityStartMode("

                                    + opts.getPendingIntentCreatorBackgroundActivityStartMode()

                                    + ") to SYSTEM_DEFINED from the options provided by the "

                                    + "pending intent sender ("

                                    + key.packageName

                                    + ") because this option is meant for the pending intent "

                                    + "creator");

                    opts.setPendingIntentCreatorBackgroundActivityStartMode(

                            ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_SYSTEM_DEFINED);

                }

                finalIntent.addFlags(opts.getPendingIntentLaunchFlags());

            }