149d5c86e675c394f1481761564c97f6309b0054 - platform/frameworks/base

commit	149d5c86e675c394f1481761564c97f6309b0054	[log] [tgz]
author	Louis Chang <louischang@google.com>	Mon Dec 30 09:47:39 2019 +0800
committer	Louis Chang <louischang@google.com>	Thu Jan 02 11:28:01 2020 +0800
tree	1b2b0cf16a0ad6471b1ee176a194a8c0b25ea9cd
parent	610a12603c78a6f680d0bbec98b0e1bd1f1b2021 [diff]

Merge RootActivityContainer and RootWindowContainer (85/n)

Bug: 80414790
Test: Existing tests pass
Change-Id: Ica2917099b09e6c091100401645ffcdfff761aa5

services/core/java/com/android/server/wm/ActivityMetricsLogger.java[diff]
services/core/java/com/android/server/wm/ActivityRecord.java[diff]
services/core/java/com/android/server/wm/ActivityStack.java[diff]
services/core/java/com/android/server/wm/ActivityStackSupervisor.java[diff]
services/core/java/com/android/server/wm/ActivityStartController.java[diff]
services/core/java/com/android/server/wm/ActivityStartInterceptor.java[diff]
services/core/java/com/android/server/wm/ActivityStarter.java[diff]
services/core/java/com/android/server/wm/ActivityTaskManagerService.java[diff]
services/core/java/com/android/server/wm/AppTaskImpl.java[diff]
services/core/java/com/android/server/wm/DisplayContent.java[diff]
services/core/java/com/android/server/wm/DisplayWindowListenerController.java[diff]
services/core/java/com/android/server/wm/EnsureActivitiesVisibleHelper.java[diff]
services/core/java/com/android/server/wm/KeyguardController.java[diff]
services/core/java/com/android/server/wm/LaunchParamsPersister.java[diff]
services/core/java/com/android/server/wm/LockTaskController.java[diff]
services/core/java/com/android/server/wm/RecentTasks.java[diff]
services/core/java/com/android/server/wm/RecentsAnimation.java[diff]
services/core/java/com/android/server/wm/ResetTargetTaskHelper.java[diff]
services/core/java/com/android/server/wm/RootActivityContainer.java[Deleted - diff]
services/core/java/com/android/server/wm/RootWindowContainer.java[diff]
services/core/java/com/android/server/wm/RunningTasks.java[diff]
services/core/java/com/android/server/wm/Task.java[diff]
services/core/java/com/android/server/wm/TaskLaunchParamsModifier.java[diff]
services/core/java/com/android/server/wm/TaskPersister.java[diff]
services/core/java/com/android/server/wm/WindowManagerService.java[diff]
services/core/java/com/android/server/wm/WindowProcessController.java[diff]
services/tests/wmtests/src/com/android/server/wm/ActivityDisplayTests.java[diff]
services/tests/wmtests/src/com/android/server/wm/ActivityMetricsLaunchObserverTests.java[diff]
services/tests/wmtests/src/com/android/server/wm/ActivityRecordTests.java[diff]
services/tests/wmtests/src/com/android/server/wm/ActivityStackSupervisorTests.java[diff]
services/tests/wmtests/src/com/android/server/wm/ActivityStackTests.java[diff]
services/tests/wmtests/src/com/android/server/wm/ActivityStartControllerTests.java[diff]
services/tests/wmtests/src/com/android/server/wm/ActivityStartInterceptorTest.java[diff]
services/tests/wmtests/src/com/android/server/wm/ActivityStarterTests.java[diff]
services/tests/wmtests/src/com/android/server/wm/ActivityTaskManagerServiceTests.java[diff]
services/tests/wmtests/src/com/android/server/wm/ActivityTestsBase.java[diff]
services/tests/wmtests/src/com/android/server/wm/DisplayContentTests.java[diff]
services/tests/wmtests/src/com/android/server/wm/LaunchParamsPersisterTests.java[diff]
services/tests/wmtests/src/com/android/server/wm/LockTaskControllerTest.java[diff]
services/tests/wmtests/src/com/android/server/wm/RecentTasksTest.java[diff]
services/tests/wmtests/src/com/android/server/wm/RecentsAnimationTest.java[diff]
services/tests/wmtests/src/com/android/server/wm/RootActivityContainerTests.java[diff]
services/tests/wmtests/src/com/android/server/wm/RunningTasksTest.java[diff]
services/tests/wmtests/src/com/android/server/wm/SizeCompatTests.java[diff]
services/tests/wmtests/src/com/android/server/wm/SystemServicesTestRule.java[diff]
services/tests/wmtests/src/com/android/server/wm/TaskLaunchParamsModifierTests.java[diff]
services/tests/wmtests/src/com/android/server/wm/TaskRecordTests.java[diff]
services/tests/wmtests/src/com/android/server/wm/TestDisplayContent.java[diff]
services/tests/wmtests/src/com/android/server/wm/WindowProcessControllerTests.java[diff]
services/tests/wmtests/src/com/android/server/wm/WindowTestsBase.java[diff]

50 files changed