summaryrefslogtreecommitdiff
path: root/tests/permission
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/permission
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/permission')
-rw-r--r--tests/permission/src/com/android/framework/permission/tests/ActivityManagerPermissionTests.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/permission/src/com/android/framework/permission/tests/ActivityManagerPermissionTests.java b/tests/permission/src/com/android/framework/permission/tests/ActivityManagerPermissionTests.java
index d7f4a38f7644..89bd8d8f1dd4 100644
--- a/tests/permission/src/com/android/framework/permission/tests/ActivityManagerPermissionTests.java
+++ b/tests/permission/src/com/android/framework/permission/tests/ActivityManagerPermissionTests.java
@@ -16,7 +16,7 @@
package com.android.framework.permission.tests;
-import android.app.ActivityManagerNative;
+import android.app.ActivityManager;
import android.app.IActivityManager;
import android.content.res.Configuration;
import android.os.RemoteException;
@@ -33,7 +33,7 @@ public class ActivityManagerPermissionTests extends TestCase {
@Override
protected void setUp() throws Exception {
super.setUp();
- mAm = ActivityManagerNative.getDefault();
+ mAm = ActivityManager.getService();
}
@SmallTest