diff options
| author | Craig Mautner <cmautner@google.com> | 2013-11-12 19:17:06 -0800 |
|---|---|---|
| committer | Craig Mautner <cmautner@google.com> | 2013-11-12 19:17:06 -0800 |
| commit | b12eb71c4fd82ac27fb3fe9a86cf9d92e0e511f2 (patch) | |
| tree | c4d685ad600e90d2dde56aebb379e3997a0ef945 /tests | |
| parent | 764197b14f2c4f1b11939c8913ba707748362950 (diff) | |
| parent | bf581034f9771fd67ea796e91ce28787c33fbb82 (diff) | |
| download | frameworks_base-b12eb71c4fd82ac27fb3fe9a86cf9d92e0e511f2.zip frameworks_base-b12eb71c4fd82ac27fb3fe9a86cf9d92e0e511f2.tar.gz frameworks_base-b12eb71c4fd82ac27fb3fe9a86cf9d92e0e511f2.tar.bz2 | |
Merge commit 'bf581034' into manualmerge
Conflicts:
tools/layoutlib/bridge/src/android/view/IWindowManagerImpl.java
Change-Id: I9fd35ea9166ec73ce1f9f6154aa4ec87e79e20cb
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 e4c4214..df32ee1 100644 --- a/tests/permission/src/com/android/framework/permission/tests/WindowManagerPermissionTests.java +++ b/tests/permission/src/com/android/framework/permission/tests/WindowManagerPermissionTests.java @@ -93,7 +93,7 @@ public class WindowManagerPermissionTests extends TestCase { } try { - mWm.addAppToken(0, null, 0, 0, 0, false, false, 0); + mWm.addAppToken(0, null, 0, 0, 0, false, false, 0, 0); fail("IWindowManager.addAppToken did not throw SecurityException as" + " expected"); } catch (SecurityException e) { |