diff options
| author | Sudheer Shanka <sudheersai@google.com> | 2016-11-10 15:30:17 -0800 |
|---|---|---|
| committer | Sudheer Shanka <sudheersai@google.com> | 2016-11-14 11:27:12 -0800 |
| commit | dc589ac82b5fe2063f4cfd94c8ae26d43d5420a0 (patch) | |
| tree | 9021de8b2f115316bfe52185ef0768946e981b45 /tests/AppLaunch/src | |
| parent | 8c053ae1f6ffd531fc2b6070094202b59efe3818 (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/AppLaunch/src')
| -rw-r--r-- | tests/AppLaunch/src/com/android/tests/applaunch/AppLaunch.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/AppLaunch/src/com/android/tests/applaunch/AppLaunch.java b/tests/AppLaunch/src/com/android/tests/applaunch/AppLaunch.java index f5f7ea3895d7..0aa20ef85e8a 100644 --- a/tests/AppLaunch/src/com/android/tests/applaunch/AppLaunch.java +++ b/tests/AppLaunch/src/com/android/tests/applaunch/AppLaunch.java @@ -19,7 +19,6 @@ import java.io.OutputStreamWriter; import android.accounts.Account; import android.accounts.AccountManager; -import android.app.ActivityManagerNative; import android.app.ActivityManager; import android.app.ActivityManager.ProcessErrorStateInfo; import android.content.Context; @@ -144,7 +143,7 @@ public class AppLaunch extends InstrumentationTestCase { InstrumentationTestRunner instrumentation = (InstrumentationTestRunner)getInstrumentation(); Bundle args = instrumentation.getArguments(); - mAm = ActivityManagerNative.getDefault(); + mAm = ActivityManager.getService(); String launchDirectory = args.getString(KEY_LAUNCH_DIRECTORY); mTraceDirectoryStr = args.getString(KEY_TRACE_DIRECTORY); mDropCache = Boolean.parseBoolean(args.getString(KEY_DROP_CACHE)); |