summaryrefslogtreecommitdiff
path: root/tests/MemoryUsage
diff options
context:
space:
mode:
authorSudheer Shanka <sudheersai@google.com>2016-11-10 15:30:17 -0800
committerSudheer Shanka <sudheersai@google.com>2016-11-14 11:27:12 -0800
commitdc589ac82b5fe2063f4cfd94c8ae26d43d5420a0 (patch)
tree9021de8b2f115316bfe52185ef0768946e981b45 /tests/MemoryUsage
parent8c053ae1f6ffd531fc2b6070094202b59efe3818 (diff)
Update usage of ActivityManagerNative.
- Remove references to ActivityManagerProxy. - Add isSystemReady to ActivityManager. Bug: 30977067 Test: cts/hostsidetests/services/activityandwindowmanager/util/run-test android.server.cts adb shell am instrument -e class com.android.server.am.ActivityManagerTest,com.android.server.am.TaskStackChangedListenerTest \ -w com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner Change-Id: I07390b6124fb1515821f5c0b37baf6ae74adc8fa
Diffstat (limited to 'tests/MemoryUsage')
-rw-r--r--tests/MemoryUsage/src/com/android/tests/memoryusage/MemoryUsageTest.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/MemoryUsage/src/com/android/tests/memoryusage/MemoryUsageTest.java b/tests/MemoryUsage/src/com/android/tests/memoryusage/MemoryUsageTest.java
index a7e3bece6e63..1ae318a96a50 100644
--- a/tests/MemoryUsage/src/com/android/tests/memoryusage/MemoryUsageTest.java
+++ b/tests/MemoryUsage/src/com/android/tests/memoryusage/MemoryUsageTest.java
@@ -18,7 +18,6 @@ package com.android.tests.memoryusage;
import android.app.ActivityManager;
import android.app.ActivityManager.ProcessErrorStateInfo;
import android.app.ActivityManager.RunningAppProcessInfo;
-import android.app.ActivityManagerNative;
import android.app.IActivityManager;
import android.app.UiAutomation;
import android.content.Context;
@@ -84,7 +83,7 @@ public class MemoryUsageTest extends InstrumentationTestCase {
MemoryUsageInstrumentation instrumentation =
(MemoryUsageInstrumentation) getInstrumentation();
Bundle args = instrumentation.getBundle();
- mAm = ActivityManagerNative.getDefault();
+ mAm = ActivityManager.getService();
createMappings();
parseArgs(args);