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

Commit 38b4ec91 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Make sure only the top-most running activity can be active" into rvc-dev am: 3b6ade6a 

Change-Id: Ibf480819c9a1ddb60e267cc392674e52249071b3
parents 960d9442 3b6ade6a

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

+1 −10
Original line number Diff line number Diff line
@@ -4785,16 +4785,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
        if (!task.hasChild(this)) {

            throw new IllegalStateException("Activity not found in its task");

        }

        final ActivityRecord activityAbove = task.getActivityAbove(this);

        if (activityAbove == null) {

            // It's the topmost activity in the task - should become resumed now

            return true;

        }

        // Check if activity above is finishing now and this one becomes the topmost in task.

        if (activityAbove.finishing) {

            return true;

        }

        return false;

        return task.topRunningActivity() == this;

    }



    void handleAlreadyVisible() {

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

+10 −0
Original line number Diff line number Diff line
@@ -487,6 +487,16 @@ public class ActivityRecordTests extends ActivityTestsBase { 
        assertEquals(true, mActivity.shouldMakeActive(null /* activeActivity */));

    }



    @Test

    public void testShouldMakeActive_nonTopVisible() {

        ActivityRecord finishingActivity = new ActivityBuilder(mService).setTask(mTask).build();

        finishingActivity.finishing = true;

        ActivityRecord topActivity = new ActivityBuilder(mService).setTask(mTask).build();

        mActivity.setState(ActivityStack.ActivityState.STOPPED, "Testing");



        assertEquals(false, mActivity.shouldMakeActive(null /* activeActivity */));

    }



    @Test

    public void testShouldResume_stackVisibility() {

        mActivity.setState(ActivityStack.ActivityState.STOPPED, "Testing");