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

Commit 3ea014d0 authored by Evan Rosky's avatar Evan Rosky Committed by Automerger Merge Worker
Browse files

Merge "Apply pending-intent op before blanket locktask check" into udc-dev am:... 

Merge "Apply pending-intent op before blanket locktask check" into udc-dev am: 0e875249 am: e901bc15

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



Change-Id: I8efbccc780770217366b31ab452426aa25e24571
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 21e41eee e901bc15

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

+14 −14
Original line number Diff line number Diff line
@@ -960,20 +960,6 @@ class WindowOrganizerController extends IWindowOrganizerController.Stub 
                        errorCallbackToken, organizer);

                break;

            }

            default: {

                // The other operations may change task order so they are skipped while in lock

                // task mode. The above operations are still allowed because they don't move

                // tasks. And it may be necessary such as clearing launch root after entering

                // lock task mode.

                if (isInLockTaskMode) {

                    Slog.w(TAG, "Skip applying hierarchy operation " + hop

                            + " while in lock task mode");

                    return effects;

                }

            }

        }



        switch (type) {

            case HIERARCHY_OP_TYPE_PENDING_INTENT: {

                final Bundle launchOpts = hop.getLaunchOptions();

                ActivityOptions activityOptions = launchOpts != null
@@ -1012,6 +998,20 @@ class WindowOrganizerController extends IWindowOrganizerController.Stub 
                }

                break;

            }

            default: {

                // The other operations may change task order so they are skipped while in lock

                // task mode. The above operations are still allowed because they don't move

                // tasks. And it may be necessary such as clearing launch root after entering

                // lock task mode.

                if (isInLockTaskMode) {

                    Slog.w(TAG, "Skip applying hierarchy operation " + hop

                            + " while in lock task mode");

                    return effects;

                }

            }

        }



        switch (type) {

            case HIERARCHY_OP_TYPE_START_SHORTCUT: {

                final Bundle launchOpts = hop.getLaunchOptions();

                final String callingPackage = launchOpts.getString(