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

Commit 21273ba5 authored by Christophe Pinelli's avatar Christophe Pinelli Committed by Automerger Merge Worker
Browse files

Merge "Restrict activity launch when caller is running in the background" into... 

Merge "Restrict activity launch when caller is running in the background" into udc-qpr-dev am: 16e9c963

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



Change-Id: Iea3e5d26fa727b3a1af69c5cea18a2ee465cbe28
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 35294cf9 16e9c963

services/core/java/com/android/server/wm/ActivityTaskManagerService.java

+31 −21
Original line number Diff line number Diff line
@@ -1411,6 +1411,18 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 


            final long origId = Binder.clearCallingIdentity();

            // TODO(b/64750076): Check if calling pid should really be -1.

            try {

                if (options == null) {

                    options = new SafeActivityOptions(ActivityOptions.makeBasic());

                }



                // Fixes b/230492947

                // Prevents background activity launch through #startNextMatchingActivity

                // An activity going into the background could still go back to the foreground

                // if the intent used matches both:

                // - the activity in the background

                // - a second activity.

                options.getOptions(r).setAvoidMoveToFront();

                final int res = getActivityStartController()

                        .obtainStarter(intent, "startNextMatchingActivity")

                        .setCaller(r.app.getThread())
@@ -1427,13 +1439,11 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 
                        .setRealCallingUid(r.launchedFromUid)

                        .setActivityOptions(options)

                        .execute();

            Binder.restoreCallingIdentity(origId);



                r.finishing = wasFinishing;

            if (res != ActivityManager.START_SUCCESS) {

                return false;

                return res == ActivityManager.START_SUCCESS;

            } finally {

                Binder.restoreCallingIdentity(origId);

            }

            return true;

        }

    }