Merge "Consolidate updating bounds in ActivityStarter." (ed33dcb7) · Commits · e / os / android_frameworks_base

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -471,7 +471,8 @@ class ActivityStack<T extends StackWindowController> extends ConfigurationContai
		}

		T createStackWindowController(int displayId, boolean onTop, Rect outBounds) {
		return (T) new StackWindowController(mStackId, this, displayId, onTop, outBounds);
		return (T) new StackWindowController(mStackId, this, displayId, onTop, outBounds,
		mStackSupervisor.mWindowManager);
		}

		T getWindowContainerController() {

services/core/java/com/android/server/am/ActivityStarter.java

+17 −15

Original line number	Diff line number	Diff line
		@@ -1799,15 +1799,8 @@ class ActivityStarter {
		mNewTaskIntent != null ? mNewTaskIntent : mIntent, mVoiceSession,
		mVoiceInteractor, !mLaunchTaskBehind /* toTop */);
		addOrReparentStartingActivity(task, "setTaskFromReuseOrCreateNewTask - mReuseTask");
		if (mLaunchBounds != null) {
		final int stackId = mTargetStack.mStackId;
		if (StackId.resizeStackWithLaunchBounds(stackId)) {
		mService.resizeStack(
		stackId, mLaunchBounds, true, !PRESERVE_WINDOWS, ANIMATE, -1);
		} else {
		mStartActivity.getTask().updateOverrideConfiguration(mLaunchBounds);
		}
		}
		updateBounds(mStartActivity.getTask(), mLaunchBounds);

		if (DEBUG_TASKS) Slog.v(TAG_TASKS, "Starting new activity " + mStartActivity
		+ " in new task " + mStartActivity.getTask());
		} else {
		@@ -1971,19 +1964,15 @@ class ActivityStarter {
		}

		if (mLaunchBounds != null) {
		mInTask.updateOverrideConfiguration(mLaunchBounds);
		// TODO: Shouldn't we already know what stack to use by the time we get here?
		ActivityStack stack = mSupervisor.getLaunchStack(null, null, mInTask, ON_TOP);
		if (stack != mInTask.getStack()) {
		mInTask.reparent(stack, ON_TOP, REPARENT_KEEP_STACK_AT_FRONT, !ANIMATE,
		DEFER_RESUME, "inTaskToFront");
		stack = mInTask.getStack();
		mTargetStack = mInTask.getStack();
		}
		if (StackId.resizeStackWithLaunchBounds(stack.mStackId)) {
		mService.resizeStack(
		stack.mStackId, mLaunchBounds, true, !PRESERVE_WINDOWS, ANIMATE, -1);
		}

		updateBounds(mInTask, mLaunchBounds);
		}

		mTargetStack.moveTaskToFrontLocked(
		@@ -1996,6 +1985,19 @@ class ActivityStarter {
		return START_SUCCESS;
		}

		void updateBounds(TaskRecord task, Rect bounds) {
		if (bounds == null) {
		return;
		}

		final int stackId = task.getStackId();
		if (StackId.resizeStackWithLaunchBounds(stackId)) {
		mService.resizeStack(stackId, bounds, true, !PRESERVE_WINDOWS, ANIMATE, -1);
		} else {
		task.updateOverrideConfiguration(bounds);
		}
		}

		private void setTaskToCurrentTopOrCreateNewTask() {
		mTargetStack = computeStackFocus(mStartActivity, false, null /* bounds */, mLaunchFlags,
		mOptions);

services/core/java/com/android/server/am/PinnedActivityStack.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -43,7 +43,8 @@ class PinnedActivityStack extends ActivityStack<PinnedStackWindowController>
		@Override
		PinnedStackWindowController createStackWindowController(int displayId, boolean onTop,
		Rect outBounds) {
		return new PinnedStackWindowController(mStackId, this, displayId, onTop, outBounds);
		return new PinnedStackWindowController(mStackId, this, displayId, onTop, outBounds,
		mStackSupervisor.mWindowManager);
		}

		Rect getDefaultPictureInPictureBounds(float aspectRatio) {

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -37,8 +37,8 @@ public class PinnedStackWindowController extends StackWindowController {
		private Rect mTmpToBounds = new Rect();

		public PinnedStackWindowController(int stackId, PinnedStackWindowListener listener,
		int displayId, boolean onTop, Rect outBounds) {
		super(stackId, listener, displayId, onTop, outBounds, WindowManagerService.getInstance());
		int displayId, boolean onTop, Rect outBounds, WindowManagerService service) {
		super(stackId, listener, displayId, onTop, outBounds, service);
		}

		/**

services/tests/servicestests/src/com/android/server/am/ActivityStarterTests.java

0 → 100644

+97 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2017 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License
		*/

		package com.android.server.am;

		import static android.app.WindowConfiguration.ACTIVITY_TYPE_STANDARD;
		import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN;
		import static android.app.WindowConfiguration.WINDOWING_MODE_PINNED;

		import android.app.ActivityManager;
		import android.content.ComponentName;
		import android.graphics.Rect;
		import android.platform.test.annotations.Presubmit;
		import android.support.test.filters.SmallTest;
		import android.support.test.runner.AndroidJUnit4;

		import org.junit.runner.RunWith;
		import org.junit.Test;

		import static com.android.server.am.ActivityManagerService.ANIMATE;

		import static org.junit.Assert.assertEquals;
		import static org.junit.Assert.assertTrue;
		import static org.mockito.Mockito.any;
		import static org.mockito.Mockito.anyBoolean;
		import static org.mockito.Mockito.anyInt;
		import static org.mockito.Mockito.eq;
		import static org.mockito.Mockito.verify;
		import static org.mockito.Mockito.times;

		/**
		* Tests for the {@link ActivityStack} class.
		*
		* Build/Install/Run:
		* bit FrameworksServicesTests:com.android.server.am.ActivityStarterTests
		*/
		@SmallTest
		@Presubmit
		@RunWith(AndroidJUnit4.class)
		public class ActivityStarterTests extends ActivityTestsBase {
		private static final ComponentName testActivityComponent =
		ComponentName.unflattenFromString("com.foo/.BarActivity");

		private ActivityManagerService mService;
		private ActivityStarter mStarter;

		@Override
		public void setUp() throws Exception {
		super.setUp();
		mService = createActivityManagerService();
		mStarter = new ActivityStarter(mService, mService.mStackSupervisor);
		}

		@Test
		public void testUpdateLaunchBounds() throws Exception {
		// When in a non-resizeable stack, the task bounds should be updated.
		final TaskRecord task = createTask(mService.mStackSupervisor, testActivityComponent,
		mService.mStackSupervisor.getDefaultDisplay().createStack(
		WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD, true /* onTop */));
		final Rect bounds = new Rect(10, 10, 100, 100);

		mStarter.updateBounds(task, bounds);
		assertEquals(task.mBounds, bounds);
		assertEquals(task.getStack().mBounds, null);

		// When in a resizeable stack, the stack bounds should be updated as well.
		final TaskRecord task2 = createTask(mService.mStackSupervisor, testActivityComponent,
		mService.mStackSupervisor.getDefaultDisplay().createStack(
		WINDOWING_MODE_PINNED, ACTIVITY_TYPE_STANDARD, true /* onTop */));
		assertTrue(task2.getStack() instanceof PinnedActivityStack);
		mStarter.updateBounds(task2, bounds);

		verify(mService, times(1)).resizeStack(eq(ActivityManager.StackId.PINNED_STACK_ID),
		eq(bounds), anyBoolean(), anyBoolean(), anyBoolean(), anyInt());

		// In the case of no animation, the stack and task bounds should be set immediately.
		if (!ANIMATE) {
		assertEquals(task2.getStack().mBounds, bounds);
		assertEquals(task2.mBounds, bounds);
		} else {
		assertEquals(task2.mBounds, null);
		}
		}
		}
		No newline at end of file