summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2012-12-03 15:51:27 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-12-03 15:51:47 -0800
commite0a676a3bb0e7b9aced9359a021e4c5d2ffef752 (patch)
treed2210840f1856902832120e2667b6c0c5c053499 /tests
parentcd6ffc82ef248dc0260f2b5fb615d0ae727664b9 (diff)
parentbb4ca5271a806c94a59d98c5c718db7b89728246 (diff)
downloadframeworks_base-e0a676a3bb0e7b9aced9359a021e4c5d2ffef752.zip
frameworks_base-e0a676a3bb0e7b9aced9359a021e4c5d2ffef752.tar.gz
frameworks_base-e0a676a3bb0e7b9aced9359a021e4c5d2ffef752.tar.bz2
Merge "Fix issue #7649590: Background windows sometimes not being hidden for secondary users" into jb-mr1.1-dev
Diffstat (limited to 'tests')
-rw-r--r--tests/permission/src/com/android/framework/permission/tests/WindowManagerPermissionTests.java2
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 746ac06..596f722 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, false, false);
+ mWm.addAppToken(0, 0, null, 0, 0, false, false);
fail("IWindowManager.addAppToken did not throw SecurityException as"
+ " expected");
} catch (SecurityException e) {