summaryrefslogtreecommitdiff
path: root/tests/permission/src
diff options
context:
space:
mode:
authorWale Ogunwale <ogunwale@google.com>2015-12-26 07:36:26 -0800
committerWale Ogunwale <ogunwale@google.com>2016-01-04 22:23:56 +0000
commit6cae765b67d3a3b37e2cacbc9816665b5bc080b9 (patch)
tree33f08d077dd23e35c92dba6cb8233c6a255e515d /tests/permission/src
parent46ca282851ef12755a64810658a6043e70d6db5d (diff)
Added support for android.R.attr#alwaysFocusable
Allows an activity to always be focusable regardless of if it is in a stack whose activities are normally not focusable. For example, activities in pinned stack aren't focusable. This flag allows them to be focusable. Also, changed ActivityInfo.#{resizeable, supportsPip} to use flags. Bug: 26273032 Bug: 26034613 Change-Id: I8c63e6d3256757e2e6931e08b8a65269f5169d35
Diffstat (limited to 'tests/permission/src')
-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 3c2659f6ab59..b78fd494e555 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, 0, false, false, null,
- Configuration.EMPTY, false);
+ Configuration.EMPTY, false, false);
fail("IWindowManager.addAppToken did not throw SecurityException as"
+ " expected");
} catch (SecurityException e) {