From 5406e7ade87c33f70c83a283781dcc48fb67cdb9 Mon Sep 17 00:00:00 2001 From: Andrii Kulian Date: Fri, 21 Oct 2016 11:55:23 -0700 Subject: 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 --- .../framework/permission/tests/WindowManagerPermissionTests.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'tests/permission/src') 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) { -- cgit v1.2.3-59-g8ed1b