diff options
| author | Wale Ogunwale <ogunwale@google.com> | 2018-04-30 13:55:07 -0700 |
|---|---|---|
| committer | Wale Ogunwale <ogunwale@google.com> | 2018-06-12 13:38:39 -0700 |
| commit | 04d9cb5f401e74ad2e34baa4e7b20e280590fe02 (patch) | |
| tree | 45c3178cb34ca0901e9ff36d02211686203fa5ac /tests/MemoryUsage/src | |
| parent | 8bb0cc2f5dd814fbed6ea19870bf0cb9e0fe5c3d (diff) | |
Moved some activities implementation to ActivityTaskManagerService (2/n)
Second step in unifying the window hierarchy that is currently split
within AM and WM packages. We move some of the API implementation for
activities from ActivityManagerService.java to
ActivityTaskManagerService.java.
Test: Existing tests pass
Test: go/wm-smoke-auto
Bug: 80414790
Change-Id: I23dcd924493d8ad1e0b6e3a55386fd72b0146605
Diffstat (limited to 'tests/MemoryUsage/src')
| -rw-r--r-- | tests/MemoryUsage/src/com/android/tests/memoryusage/MemoryUsageTest.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tests/MemoryUsage/src/com/android/tests/memoryusage/MemoryUsageTest.java b/tests/MemoryUsage/src/com/android/tests/memoryusage/MemoryUsageTest.java index 1ae318a96a50..653282d0d365 100644 --- a/tests/MemoryUsage/src/com/android/tests/memoryusage/MemoryUsageTest.java +++ b/tests/MemoryUsage/src/com/android/tests/memoryusage/MemoryUsageTest.java @@ -18,7 +18,9 @@ package com.android.tests.memoryusage; import android.app.ActivityManager; import android.app.ActivityManager.ProcessErrorStateInfo; import android.app.ActivityManager.RunningAppProcessInfo; +import android.app.ActivityTaskManager; import android.app.IActivityManager; +import android.app.IActivityTaskManager; import android.app.UiAutomation; import android.content.Context; import android.content.Intent; @@ -66,6 +68,7 @@ public class MemoryUsageTest extends InstrumentationTestCase { private Map<String, String> mNameToResultKey; private Set<String> mPersistentProcesses; private IActivityManager mAm; + private IActivityTaskManager mAtm; @Override protected void setUp() throws Exception { @@ -84,6 +87,7 @@ public class MemoryUsageTest extends InstrumentationTestCase { (MemoryUsageInstrumentation) getInstrumentation(); Bundle args = instrumentation.getBundle(); mAm = ActivityManager.getService(); + mAtm = ActivityTaskManager.getService(); createMappings(); parseArgs(args); @@ -316,7 +320,7 @@ public class MemoryUsageTest extends InstrumentationTestCase { UserHandle.USER_CURRENT); } - mAm.startActivityAndWait(null, null, mLaunchIntent, mimeType, + mAtm.startActivityAndWait(null, null, mLaunchIntent, mimeType, null, null, 0, mLaunchIntent.getFlags(), null, null, UserHandle.USER_CURRENT_OR_SELF); } catch (RemoteException e) { |