summaryrefslogtreecommitdiff
path: root/tests/permission/src
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2016-02-26 17:23:48 -0800
committerDianne Hackborn <hackbod@google.com>2016-02-29 12:37:11 -0800
commit4a18c26609df2c4230885acb64e92fb51aba70df (patch)
treeb9f05aa7e6979f02a34d9ac335d06eae31358495 /tests/permission/src
parent1db8850b793109da0fc4a65ec837b1a329072b07 (diff)
Fix issue #27385109: control activity behavior without triggering...
...isUserAMonkey for testing purpose Add an argument for the caller to specify if they are a poo flinging monkey. Change-Id: I0e149a8d78776abaf07517bd4ae886047b7f4252
Diffstat (limited to 'tests/permission/src')
-rw-r--r--tests/permission/src/com/android/framework/permission/tests/ActivityManagerPermissionTests.java2
1 files changed, 1 insertions, 1 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 3791d0246f69..d7f4a38f7644 100644
--- a/tests/permission/src/com/android/framework/permission/tests/ActivityManagerPermissionTests.java
+++ b/tests/permission/src/com/android/framework/permission/tests/ActivityManagerPermissionTests.java
@@ -140,7 +140,7 @@ public class ActivityManagerPermissionTests extends TestCase {
@SmallTest
public void testSET_ACTIVITY_WATCHER() {
try {
- mAm.setActivityController(null);
+ mAm.setActivityController(null, false);
fail("IActivityManager.setActivityController did not throw SecurityException as"
+ " expected");
} catch (SecurityException e) {