summaryrefslogtreecommitdiff
path: root/tests/permission/src
diff options
context:
space:
mode:
authorWale Ogunwale <ogunwale@google.com>2018-04-30 13:55:07 -0700
committerWale Ogunwale <ogunwale@google.com>2018-06-12 13:38:39 -0700
commit04d9cb5f401e74ad2e34baa4e7b20e280590fe02 (patch)
tree45c3178cb34ca0901e9ff36d02211686203fa5ac /tests/permission/src
parent8bb0cc2f5dd814fbed6ea19870bf0cb9e0fe5c3d (diff)
Moved some activities implementation to ActivityTaskManagerService (2/n)
Second step in unifying the window hierarchy that is currently split within AM and WM packages. We move some of the API implementation for activities from ActivityManagerService.java to ActivityTaskManagerService.java. Test: Existing tests pass Test: go/wm-smoke-auto Bug: 80414790 Change-Id: I23dcd924493d8ad1e0b6e3a55386fd72b0146605
Diffstat (limited to 'tests/permission/src')
-rw-r--r--tests/permission/src/com/android/framework/permission/tests/ActivityManagerPermissionTests.java13
1 files changed, 2 insertions, 11 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 89bd8d8f1dd4..548a0c22c569 100644
--- a/tests/permission/src/com/android/framework/permission/tests/ActivityManagerPermissionTests.java
+++ b/tests/permission/src/com/android/framework/permission/tests/ActivityManagerPermissionTests.java
@@ -17,6 +17,7 @@
package com.android.framework.permission.tests;
import android.app.ActivityManager;
+import android.app.ActivityTaskManager;
import android.app.IActivityManager;
import android.content.res.Configuration;
import android.os.RemoteException;
@@ -47,22 +48,12 @@ public class ActivityManagerPermissionTests extends TestCase {
} catch (RemoteException e) {
fail("Unexpected remote exception");
}
-
- try {
- mAm.moveTaskBackwards(-1);
- fail("IActivityManager.moveTaskToFront did not throw SecurityException as"
- + " expected");
- } catch (SecurityException e) {
- // expected
- } catch (RemoteException e) {
- fail("Unexpected remote exception");
- }
}
@SmallTest
public void testCHANGE_CONFIGURATION() {
try {
- mAm.updateConfiguration(new Configuration());
+ ActivityTaskManager.getService().updateConfiguration(new Configuration());
fail("IActivityManager.updateConfiguration did not throw SecurityException as"
+ " expected");
} catch (SecurityException e) {