diff options
| author | Dianne Hackborn <hackbod@google.com> | 2009-07-13 13:07:51 -0700 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2009-07-14 11:37:11 -0700 |
| commit | b06ea706530e6d19eb2a1a9a7ae6c5dd77d80af0 (patch) | |
| tree | 2fcae8f89195ef4b162627892aeca97f06d42ef7 /tests/permission | |
| parent | 3660c09500a4d01eb6a733b5f0b15545855f8fe8 (diff) | |
| download | frameworks_base-b06ea706530e6d19eb2a1a9a7ae6c5dd77d80af0.zip frameworks_base-b06ea706530e6d19eb2a1a9a7ae6c5dd77d80af0.tar.gz frameworks_base-b06ea706530e6d19eb2a1a9a7ae6c5dd77d80af0.tar.bz2 | |
Add reporting of activity movement for search manager.
This adds a new API with the activity manager to find out about movement between
activities. For my sanity, the old IActivityWatcher is now renamed to
IActivityController, and the new activity movement interface is named
IActivityWatcher.
This changes the search manager itself to use the new API to manage its state.
Note that there are still problems when going back to the search dialog after
it was hidden -- the suggestions window no longer appears until you explicitly
dismiss and re-show it.
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 |