diff options
| author | Dianne Hackborn <hackbod@google.com> | 2011-05-31 18:11:29 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-31 18:11:29 -0700 |
| commit | 7322e557cfe42da42779625d69ced2db74a9df90 (patch) | |
| tree | 168cbb98976d6c44a513c3e6a7a3c79957f85fb1 /tests | |
| parent | 409db558b3f47ac28f1291d82bef15a07b2920c3 (diff) | |
| parent | a4cfcf10cc300a1eb5b2a4254fb7d3190c56c4f1 (diff) | |
| download | frameworks_base-7322e557cfe42da42779625d69ced2db74a9df90.zip frameworks_base-7322e557cfe42da42779625d69ced2db74a9df90.tar.gz frameworks_base-7322e557cfe42da42779625d69ced2db74a9df90.tar.bz2 | |
am a4cfcf10: am 75d6b3c2: Merge "Fix issue #4502672: Wrong xml resources used for homescreen widgets." into honeycomb-mr2
* commit 'a4cfcf10cc300a1eb5b2a4254fb7d3190c56c4f1':
Fix issue #4502672: Wrong xml resources used for homescreen widgets.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/permission/src/com/android/framework/permission/tests/WindowManagerPermissionTests.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/permission/src/com/android/framework/permission/tests/WindowManagerPermissionTests.java b/tests/permission/src/com/android/framework/permission/tests/WindowManagerPermissionTests.java index e0f0f05..f015378 100644 --- a/tests/permission/src/com/android/framework/permission/tests/WindowManagerPermissionTests.java +++ b/tests/permission/src/com/android/framework/permission/tests/WindowManagerPermissionTests.java @@ -164,7 +164,7 @@ public class WindowManagerPermissionTests extends TestCase { } try { - mWm.setAppStartingWindow(null, "foo", 0, null, 0, 0, 0, null, false); + mWm.setAppStartingWindow(null, "foo", 0, null, null, 0, 0, 0, null, false); fail("IWindowManager.setAppStartingWindow did not throw SecurityException as" + " expected"); } catch (SecurityException e) { |