diff options
| author | Dianne Hackborn <hackbod@google.com> | 2009-07-14 12:51:00 -0700 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2009-07-14 12:51:00 -0700 |
| commit | dace230043314d6fab1c5ced4b031eaccd814c25 (patch) | |
| tree | 0c2fbb477f5d94641cee6aa892600b6d34bc96d3 /tests/permission | |
| parent | ae4f31706fa0589ede00dfce344779a1570cd2f3 (diff) | |
| parent | b06ea706530e6d19eb2a1a9a7ae6c5dd77d80af0 (diff) | |
| download | frameworks_base-dace230043314d6fab1c5ced4b031eaccd814c25.zip frameworks_base-dace230043314d6fab1c5ced4b031eaccd814c25.tar.gz frameworks_base-dace230043314d6fab1c5ced4b031eaccd814c25.tar.bz2 | |
resolved conflicts for merge of b06ea706 to master
Diffstat (limited to 'tests/permission')
| -rw-r--r-- | tests/permission/src/com/android/framework/permission/tests/ActivityManagerPermissionTests.java | 4 |
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 14d3d73..c782045 100644 --- a/tests/permission/src/com/android/framework/permission/tests/ActivityManagerPermissionTests.java +++ b/tests/permission/src/com/android/framework/permission/tests/ActivityManagerPermissionTests.java @@ -134,8 +134,8 @@ public class ActivityManagerPermissionTests extends TestCase { @SmallTest public void testSET_ACTIVITY_WATCHER() { try { - mAm.setActivityWatcher(null); - fail("IActivityManager.setActivityWatcher did not throw SecurityException as" + mAm.setActivityController(null); + fail("IActivityManager.setActivityController did not throw SecurityException as" + " expected"); } catch (SecurityException e) { // expected |