Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Synchronize RootWindowContainerTests" into pi-dev

Browse Source
This commit is contained in:
Chavi Weingarten
2018-04-25 14:44:17 +00:00
committed by Android (Google) Code Review
parent 8f699919ce 0dc5880ab7
commit 628e9b3d37
1 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
services/tests/servicestests/src/com/android/server/wm/RootWindowContainerTests.java
View File

@@ -24,27 +24,29 @@ import static org.junit.Assert.assertTrue;
public class RootWindowContainerTests extends WindowTestsBase { public class RootWindowContainerTests extends WindowTestsBase {
@Test @Test
public void testSetDisplayOverrideConfigurationIfNeeded() throws Exception { public void testSetDisplayOverrideConfigurationIfNeeded() throws Exception {
// Add first stack we expect to be updated with configuration change. synchronized (sWm.mWindowMap) {
final TaskStack stack = createTaskStackOnDisplay(mDisplayContent); // Add first stack we expect to be updated with configuration change.
stack.getOverrideConfiguration().windowConfiguration.setBounds(new Rect(0, 0, 5, 5)); final TaskStack stack = createTaskStackOnDisplay(mDisplayContent);
stack.getOverrideConfiguration().windowConfiguration.setBounds(new Rect(0, 0, 5, 5));
// Add second task that will be set for deferred removal that should not be returned // Add second task that will be set for deferred removal that should not be returned
// with the configuration change. // with the configuration change.
final TaskStack deferredDeletedStack = createTaskStackOnDisplay(mDisplayContent); final TaskStack deferredDeletedStack = createTaskStackOnDisplay(mDisplayContent);
deferredDeletedStack.getOverrideConfiguration().windowConfiguration.setBounds( deferredDeletedStack.getOverrideConfiguration().windowConfiguration.setBounds(
new Rect(0, 0, 5, 5)); new Rect(0, 0, 5, 5));
deferredDeletedStack.mDeferRemoval = true; deferredDeletedStack.mDeferRemoval = true;
final Configuration override = new Configuration( final Configuration override = new Configuration(
mDisplayContent.getOverrideConfiguration()); mDisplayContent.getOverrideConfiguration());
override.windowConfiguration.setBounds(new Rect(0, 0, 10, 10)); override.windowConfiguration.setBounds(new Rect(0, 0, 10, 10));
// Set display override. // Set display override.
final int[] results = sWm.mRoot.setDisplayOverrideConfigurationIfNeeded(override, final int[] results = sWm.mRoot.setDisplayOverrideConfigurationIfNeeded(override,
mDisplayContent.getDisplayId()); mDisplayContent.getDisplayId());
// Ensure only first stack is returned. // Ensure only first stack is returned.
assertTrue(results.length == 1); assertTrue(results.length == 1);
assertTrue(results[0] == stack.mStackId); assertTrue(results[0] == stack.mStackId);
}
} }
} }