summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorAndrii Kulian <akulian@google.com>2016-10-21 11:55:23 -0700
committerAndrii Kulian <akulian@google.com>2016-10-25 13:22:10 -0700
commit5406e7ade87c33f70c83a283781dcc48fb67cdb9 (patch)
tree32f090c0d0a7a34dc51aa955f128677e24345aee /tests
parentfa4c311438dc174df7acac822a9aa91ae91e9879 (diff)
Apply display override config for secondary displays
Now display-specific settings, such as dimensions and orientation, are stored in display override config. For default display it is mirroring the global config. Each time when global config is updated, override of the default display should be updated too and vice versa. Test: Existing and manual tests still pass. Change-Id: Ic6c2190092d328820f314a05bed43c875db18170
Diffstat (limited to 'tests')
-rw-r--r--tests/permission/src/com/android/framework/permission/tests/WindowManagerPermissionTests.java4
1 files changed, 3 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 84243445428a..f737b247a7f5 100644
--- a/tests/permission/src/com/android/framework/permission/tests/WindowManagerPermissionTests.java
+++ b/tests/permission/src/com/android/framework/permission/tests/WindowManagerPermissionTests.java
@@ -25,6 +25,7 @@ import android.view.IWindowManager;
import junit.framework.TestCase;
import static android.app.ActivityManager.StackId.INVALID_STACK_ID;
+import static android.view.Display.DEFAULT_DISPLAY;
/**
* TODO: Remove this. This is only a placeholder, need to implement this.
@@ -113,7 +114,8 @@ public class WindowManagerPermissionTests extends TestCase {
}
try {
- mWm.updateOrientationFromAppTokens(new Configuration(), null);
+ mWm.updateOrientationFromAppTokens(new Configuration(),
+ null /* freezeThisOneIfNeeded */, DEFAULT_DISPLAY);
fail("IWindowManager.updateOrientationFromAppTokens did not throw SecurityException as"
+ " expected");
} catch (SecurityException e) {