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/dpm | |
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/dpm')
-rw-r--r-- | cmds/dpm/src/com/android/commands/dpm/Dpm.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmds/dpm/src/com/android/commands/dpm/Dpm.java b/cmds/dpm/src/com/android/commands/dpm/Dpm.java index 31c742153f24..3ac70d668198 100644 --- a/cmds/dpm/src/com/android/commands/dpm/Dpm.java +++ b/cmds/dpm/src/com/android/commands/dpm/Dpm.java @@ -16,7 +16,7 @@ package com.android.commands.dpm; -import android.app.ActivityManagerNative; +import android.app.ActivityManager; import android.app.IActivityManager; import android.app.admin.DevicePolicyManager; import android.app.admin.IDevicePolicyManager; @@ -117,7 +117,7 @@ public final class Dpm extends BaseCommand { mUserId = parseInt(arg); } if (mUserId == UserHandle.USER_CURRENT) { - IActivityManager activityManager = ActivityManagerNative.getDefault(); + IActivityManager activityManager = ActivityManager.getService(); try { mUserId = activityManager.getCurrentUser().id; } catch (RemoteException e) { |