diff options
| author | 2018-04-25 15:41:44 -0700 | |
|---|---|---|
| committer | 2018-06-06 18:26:21 -0700 | |
| commit | 65ebd955e1b19a0d3c995e66d1d749bae5dc8575 (patch) | |
| tree | 8c6b2b82d06e0290816a8de36fc08db8e42b5c83 /services/java/com | |
| parent | 3193b1537c9b31b8345cfb98ea7fc1d7d3ee0ac2 (diff) | |
Split interfaces and service for activities from current AM interfaces (1/n)
First step in unifying the window hierarchy that is currently split
within AM and WM packages. We separate the interfaces and service dealing
with activities and their containers (tasks, stack, display) from the
rest of AM interfaces and services. This will allow us to move the new
interfaces and services to WM when the internal states are cleaned-up.
Test: Existing tests pass
Test: go/wm-smoke-auto
Bug: 80414790
Change-Id: Ide9b3f89123b768cdbd3e3878113c7a8021187f3
Diffstat (limited to 'services/java/com')
| -rw-r--r-- | services/java/com/android/server/SystemServer.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index c864190bb34b..6108504797b5 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -63,6 +63,7 @@ import com.android.internal.util.EmergencyAffordanceManager; import com.android.internal.widget.ILockSettings; import com.android.server.accessibility.AccessibilityManagerService; import com.android.server.am.ActivityManagerService; +import com.android.server.am.ActivityTaskManagerService; import com.android.server.audio.AudioService; import com.android.server.broadcastradio.BroadcastRadioService; import com.android.server.camera.CameraServiceProxy; @@ -560,6 +561,10 @@ public final class SystemServer { ActivityManagerService.Lifecycle.class).getService(); mActivityManagerService.setSystemServiceManager(mSystemServiceManager); mActivityManagerService.setInstaller(installer); + // TODO: Might need to move after migration to WM. + ActivityTaskManagerService atm = mSystemServiceManager.startService( + ActivityTaskManagerService.Lifecycle.class).getService(); + mActivityManagerService.setActivityTaskManager(atm); traceEnd(); // Power manager needs to be started early because other services need it. |