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

Merge "Revert "Set parent for WindowProcessController"" into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-05-20 13:58:25 +00:00
committed by Android (Google) Code Review
parent 0fea6e25c5 859f0a543f
commit 55b635de99
3 changed files with 2 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/wm/WindowProcessController.java
View File

@@ -439,10 +439,7 @@ public class WindowProcessController extends ConfigurationContainer<Configuratio
@Override
protected ConfigurationContainer getParent() {
// Returning RootActivityContainer as the parent, so that this process controller always
// has full configuration and overrides (e.g. from display) are always added on top of
// global config.
return mAtm.mRootActivityContainer;
return null;
}
@HotPath(caller = HotPath.PROCESS_CHANGE)

2
services/core/java/com/android/server/wm/WindowState.java
View File

@@ -3104,7 +3104,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
if (DEBUG_RESIZE || DEBUG_ORIENTATION) Slog.v(TAG, "Reporting new frame to " + this
+ ": " + mWindowFrames.mCompatFrame);
final MergedConfiguration mergedConfiguration =
new MergedConfiguration(getProcessGlobalConfiguration(),
new MergedConfiguration(mWmService.mRoot.getConfiguration(),
getMergedOverrideConfiguration());
setLastReportedMergedConfiguration(mergedConfiguration);

22
services/tests/wmtests/src/com/android/server/wm/WindowProcessControllerTests.java
View File

@@ -26,9 +26,7 @@ import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.mock;
import android.content.pm.ApplicationInfo;
import android.content.res.Configuration;
import android.platform.test.annotations.Presubmit;
import android.view.DisplayInfo;
import org.junit.Test;
@@ -80,26 +78,6 @@ public class WindowProcessControllerTests extends ActivityTestsBase {
assertEquals(INVALID_DISPLAY, wpc.getDisplayId());
}
@Test
public void testConfigurationForSecondaryScreen() {
final WindowProcessController wpc = new WindowProcessController(
mService, mock(ApplicationInfo.class), null, 0, -1, null, null);
//By default, the process should not listen to any display.
assertEquals(INVALID_DISPLAY, wpc.getDisplayId());
// Register to a new display as a listener.
final DisplayInfo info = new DisplayInfo();
info.logicalWidth = 100;
info.logicalHeight = 100;
TestActivityDisplay display = addNewActivityDisplayAt(info, WindowContainer.POSITION_TOP);
wpc.registerDisplayConfigurationListenerLocked(display);
assertEquals(display.mDisplayId, wpc.getDisplayId());
final Configuration expectedConfig = mService.mRootActivityContainer.getConfiguration();
expectedConfig.updateFrom(display.getConfiguration());
assertEquals(expectedConfig, wpc.getConfiguration());
}
private TestActivityDisplay createTestActivityDisplayInContainer() {
final TestActivityDisplay testActivityDisplay = createNewActivityDisplay();
mRootActivityContainer.addChild(testActivityDisplay, POSITION_TOP);