From 859f0a543f9ebfa5aff9248d63436f8ea3dfbd11 Mon Sep 17 00:00:00 2001
From: Andrii Kulian <akulian@google.com>
Date: Mon, 20 May 2019 12:18:09 +0000
Subject: [PATCH] Revert "Set parent for WindowProcessController"

This reverts commit 33ab86910e9090d10dd91d760d2dc53e1f3e99e6.

Reason for revert: b/132986140
Bug: 132986140
Bug: 131915789
Change-Id: I75824cd02d4c6a557c6997ebca01354155f8cd93
---
 .../server/wm/WindowProcessController.java    |  5 +----
 .../com/android/server/wm/WindowState.java    |  2 +-
 .../wm/WindowProcessControllerTests.java      | 22 -------------------
 3 files changed, 2 insertions(+), 27 deletions(-)

diff --git a/services/core/java/com/android/server/wm/WindowProcessController.java b/services/core/java/com/android/server/wm/WindowProcessController.java
index 5fc399719aed7..12b62b99b3e21 100644
--- a/services/core/java/com/android/server/wm/WindowProcessController.java
+++ b/services/core/java/com/android/server/wm/WindowProcessController.java
@@ -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)
diff --git a/services/core/java/com/android/server/wm/WindowState.java b/services/core/java/com/android/server/wm/WindowState.java
index 4954d84b84124..dd3c6004dcad2 100644
--- a/services/core/java/com/android/server/wm/WindowState.java
+++ b/services/core/java/com/android/server/wm/WindowState.java
@@ -3103,7 +3103,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);
diff --git a/services/tests/wmtests/src/com/android/server/wm/WindowProcessControllerTests.java b/services/tests/wmtests/src/com/android/server/wm/WindowProcessControllerTests.java
index 7b8fba03b6d7c..a7c84a1c28b40 100644
--- a/services/tests/wmtests/src/com/android/server/wm/WindowProcessControllerTests.java
+++ b/services/tests/wmtests/src/com/android/server/wm/WindowProcessControllerTests.java
@@ -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);