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

Commit 4f43d969 authored by Louis Chang's avatar Louis Chang Committed by Automerger Merge Worker
Browse files

RESTRICT AUTOMERGE Make task visible if activity launched behind am: 0f26f573 

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

Change-Id: Ic1d774c1c5a799175c7da43fab66d5c092911e39
parents b784e06b 0f26f573

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

+22 −16
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ import static com.android.server.wm.ActivityStack.ActivityState.PAUSED; 
import static com.android.server.wm.ActivityStack.ActivityState.RESUMED;

import static com.android.server.wm.ActivityStack.ActivityState.STOPPED;

import static com.android.server.wm.ActivityStack.ActivityState.STOPPING;

import static com.android.server.wm.ActivityStack.STACK_VISIBILITY_INVISIBLE;

import static com.android.server.wm.ActivityStackSupervisor.DEFER_RESUME;

import static com.android.server.wm.ActivityStackSupervisor.ON_TOP;

import static com.android.server.wm.ActivityStackSupervisor.dumpHistoryList;
@@ -1931,25 +1932,30 @@ class RootWindowContainer extends WindowContainer<DisplayContent> 
    }



    boolean attachApplication(WindowProcessController app) throws RemoteException {

        final String processName = app.mName;

        boolean didSomething = false;

        for (int displayNdx = getChildCount() - 1; displayNdx >= 0; --displayNdx) {

            final DisplayContent display = getChildAt(displayNdx);

            final ActivityStack stack = display.getFocusedStack();

            if (stack == null) {

                continue;

            }



            mTmpRemoteException = null;

            mTmpBoolean = false; // Set to true if an activity was started.



            final DisplayContent display = getChildAt(displayNdx);

            for (int areaNdx = display.getTaskDisplayAreaCount() - 1; areaNdx >= 0; --areaNdx) {

                final TaskDisplayArea taskDisplayArea = display.getTaskDisplayAreaAt(areaNdx);

                for (int taskNdx = taskDisplayArea.getStackCount() - 1; taskNdx >= 0; --taskNdx) {

                    final ActivityStack rootTask = taskDisplayArea.getStackAt(taskNdx);

                    if (rootTask.getVisibility(null /*starting*/) == STACK_VISIBILITY_INVISIBLE) {

                        break;

                    }

                    final PooledFunction c = PooledLambda.obtainFunction(

                            RootWindowContainer::startActivityForAttachedApplicationIfNeeded, this,

                    PooledLambda.__(ActivityRecord.class), app, stack.topRunningActivity());

            stack.forAllActivities(c);

                            PooledLambda.__(ActivityRecord.class), app,

                            rootTask.topRunningActivity());

                    rootTask.forAllActivities(c);

                    c.recycle();

                    if (mTmpRemoteException != null) {

                        throw mTmpRemoteException;

                    }

                }

            }

            didSomething |= mTmpBoolean;

        }

        if (!didSomething) {
@@ -1966,8 +1972,8 @@ class RootWindowContainer extends WindowContainer<DisplayContent> 
        }



        try {

            if (mStackSupervisor.realStartActivityLocked(r, app, top == r /*andResume*/,

                    true /*checkConfig*/)) {

            if (mStackSupervisor.realStartActivityLocked(r, app,

                    top == r && r.isFocusable() /*andResume*/, true /*checkConfig*/)) {

                mTmpBoolean = true;

            }

        } catch (RemoteException e) {

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

+12 −0
Original line number Diff line number Diff line
@@ -3671,6 +3671,10 @@ class Task extends WindowContainer<WindowContainer> { 
            return STACK_VISIBILITY_INVISIBLE;

        }



        if (isTopActivityLaunchedBehind()) {

            return STACK_VISIBILITY_VISIBLE;

        }



        boolean gotSplitScreenStack = false;

        boolean gotOpaqueSplitScreenPrimary = false;

        boolean gotOpaqueSplitScreenSecondary = false;
@@ -3788,6 +3792,14 @@ class Task extends WindowContainer<WindowContainer> { 
                : STACK_VISIBILITY_VISIBLE;

    }



    private boolean isTopActivityLaunchedBehind() {

        final ActivityRecord top = topRunningActivity();

        if (top != null && top.mLaunchTaskBehind) {

            return true;

        }

        return false;

    }



    ActivityRecord isInTask(ActivityRecord r) {

        if (r == null) {

            return null;

services/tests/wmtests/src/com/android/server/wm/ActivityRecordTests.java

+1 −1
Original line number Diff line number Diff line
@@ -548,7 +548,7 @@ public class ActivityRecordTests extends ActivityTestsBase { 
        final ActivityStack stack = new StackBuilder(mRootWindowContainer).build();

        try {

            doReturn(false).when(stack).isTranslucent(any());

            assertFalse(mStack.shouldBeVisible(null /* starting */));

            assertTrue(mStack.shouldBeVisible(null /* starting */));



            mActivity.setLastReportedConfiguration(new MergedConfiguration(new Configuration(),

                    mActivity.getConfiguration()));