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

Commit 7cf8460c authored by Louis Chang's avatar Louis Chang
Browse files

Do not resume activities that were launched behind 

Activities was restarted while making it visible, but we shouldn't
resume it if the activity was launched behind.

Bug: 133325849
Test: atest RecentsAnimationTest
      atest ActivityVisibilityTests
      atest ActivityStarterTests

Change-Id: I4324ce443b8ccca9ac256e382507243fc4e30792
parent a80dd06e

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

+5 −1
Original line number Diff line number Diff line
@@ -2382,7 +2382,11 @@ class ActivityStack extends ConfigurationContainer { 
                r.setVisible(true);

            }

            if (r != starting) {

                mStackSupervisor.startSpecificActivityLocked(r, andResume, true /* checkConfig */);

                // We should not resume activities that being launched behind because these

                // activities are actually behind other fullscreen activities, but still required

                // to be visible (such as performing Recents animation).

                mStackSupervisor.startSpecificActivityLocked(r, andResume && !r.mLaunchTaskBehind,

                        true /* checkConfig */);

                return true;

            }

        }

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

+37 −0
Original line number Diff line number Diff line
@@ -24,14 +24,18 @@ import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED; 


import static com.android.dx.mockito.inline.extended.ExtendedMockito.doAnswer;

import static com.android.dx.mockito.inline.extended.ExtendedMockito.doCallRealMethod;

import static com.android.dx.mockito.inline.extended.ExtendedMockito.doNothing;

import static com.android.dx.mockito.inline.extended.ExtendedMockito.doReturn;

import static com.android.dx.mockito.inline.extended.ExtendedMockito.eq;

import static com.android.dx.mockito.inline.extended.ExtendedMockito.mock;

import static com.android.dx.mockito.inline.extended.ExtendedMockito.spyOn;

import static com.android.dx.mockito.inline.extended.ExtendedMockito.times;

import static com.android.dx.mockito.inline.extended.ExtendedMockito.verify;

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

import static com.android.server.wm.RecentsAnimationController.REORDER_KEEP_IN_PLACE;



import static com.google.common.truth.Truth.assertThat;



import static org.junit.Assert.assertFalse;

import static org.junit.Assert.assertTrue;

import static org.mockito.ArgumentMatchers.any;
@@ -106,6 +110,39 @@ public class RecentsAnimationTest extends ActivityTestsBase { 
        assertFalse(recentActivity.visible);

    }



    @Test

    public void testRestartRecentsActivity() throws Exception {

        // Have a recents activity that is not attached to its process (ActivityRecord.app = null).

        ActivityDisplay display = mRootActivityContainer.getDefaultDisplay();

        ActivityStack recentsStack = display.createStack(WINDOWING_MODE_FULLSCREEN,

                ACTIVITY_TYPE_RECENTS, true /* onTop */);

        ActivityRecord recentActivity = new ActivityBuilder(mService).setComponent(

                mRecentsComponent).setCreateTask(true).setStack(recentsStack).build();

        WindowProcessController app = recentActivity.app;

        recentActivity.app = null;



        // Start an activity on top.

        new ActivityBuilder(mService).setCreateTask(true).build().getActivityStack().moveToFront(

                "testRestartRecentsActivity");



        doCallRealMethod().when(mRootActivityContainer).ensureActivitiesVisible(

                any() /* starting */, anyInt() /* configChanges */,

                anyBoolean() /* preserveWindows */);

        doReturn(app).when(mService).getProcessController(eq(recentActivity.processName), anyInt());

        ClientLifecycleManager lifecycleManager = mService.getLifecycleManager();

        doNothing().when(lifecycleManager).scheduleTransaction(any());

        AppWarnings appWarnings = mService.getAppWarningsLocked();

        spyOn(appWarnings);

        doNothing().when(appWarnings).onStartActivity(any());



        startRecentsActivity();



        // Recents activity must be restarted, but not be resumed while running recents animation.

        verify(mRootActivityContainer.mStackSupervisor).startSpecificActivityLocked(

                eq(recentActivity), eq(false), anyBoolean());

        assertThat(recentActivity.getState()).isEqualTo(PAUSED);

    }



    @Test

    public void testSetLaunchTaskBehindOfTargetActivity() {

        ActivityDisplay display = mRootActivityContainer.getDefaultDisplay();