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 /cmds/am/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 'cmds/am/src')
| -rw-r--r-- | cmds/am/src/com/android/commands/am/Am.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/cmds/am/src/com/android/commands/am/Am.java b/cmds/am/src/com/android/commands/am/Am.java index 470a0faf82fc..f003061cec3a 100644 --- a/cmds/am/src/com/android/commands/am/Am.java +++ b/cmds/am/src/com/android/commands/am/Am.java @@ -23,7 +23,6 @@ import static android.app.ActivityManager.StackId.INVALID_STACK_ID; import android.app.ActivityManager; import android.app.ActivityManager.StackInfo; -import android.app.ActivityManagerNative; import android.app.IActivityContainer; import android.app.IActivityController; import android.app.IActivityManager; @@ -108,7 +107,7 @@ public class Am extends BaseCommand { @Override public void onRun() throws Exception { - mAm = ActivityManagerNative.getDefault(); + mAm = ActivityManager.getService(); if (mAm == null) { System.err.println(NO_SYSTEM_ERROR_CODE); throw new AndroidException("Can't connect to activity manager; is the system running?"); |