Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 55b635de authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 0fea6e25 859f0a54

services/core/java/com/android/server/wm/WindowProcessController.java

+1 −4
Original line number Original line Diff line number Diff line
@@ -439,10 +439,7 @@ public class WindowProcessController extends ConfigurationContainer<Configuratio 




    @Override

    @Override

    protected ConfigurationContainer getParent() {

    protected ConfigurationContainer getParent() {

        // Returning RootActivityContainer as the parent, so that this process controller always

        return null;

        // has full configuration and overrides (e.g. from display) are always added on top of

        // global config.

        return mAtm.mRootActivityContainer;

    }

    }





    @HotPath(caller = HotPath.PROCESS_CHANGE)

    @HotPath(caller = HotPath.PROCESS_CHANGE)

services/core/java/com/android/server/wm/WindowState.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -3104,7 +3104,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP 
            if (DEBUG_RESIZE || DEBUG_ORIENTATION) Slog.v(TAG, "Reporting new frame to " + this

            if (DEBUG_RESIZE || DEBUG_ORIENTATION) Slog.v(TAG, "Reporting new frame to " + this

                    + ": " + mWindowFrames.mCompatFrame);

                    + ": " + mWindowFrames.mCompatFrame);

            final MergedConfiguration mergedConfiguration =

            final MergedConfiguration mergedConfiguration =

                    new MergedConfiguration(getProcessGlobalConfiguration(),

                    new MergedConfiguration(mWmService.mRoot.getConfiguration(),

                    getMergedOverrideConfiguration());

                    getMergedOverrideConfiguration());





            setLastReportedMergedConfiguration(mergedConfiguration);

            setLastReportedMergedConfiguration(mergedConfiguration);

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

+0 −22
Original line number Original line Diff line number Diff line
@@ -26,9 +26,7 @@ import static org.junit.Assert.assertTrue; 
import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.mock;





import android.content.pm.ApplicationInfo;

import android.content.pm.ApplicationInfo;

import android.content.res.Configuration;

import android.platform.test.annotations.Presubmit;

import android.platform.test.annotations.Presubmit;

import android.view.DisplayInfo;





import org.junit.Test;

import org.junit.Test;
@@ -80,26 +78,6 @@ public class WindowProcessControllerTests extends ActivityTestsBase { 
        assertEquals(INVALID_DISPLAY, wpc.getDisplayId());

        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() {

    private TestActivityDisplay createTestActivityDisplayInContainer() {

        final TestActivityDisplay testActivityDisplay = createNewActivityDisplay();

        final TestActivityDisplay testActivityDisplay = createNewActivityDisplay();

        mRootActivityContainer.addChild(testActivityDisplay, POSITION_TOP);

        mRootActivityContainer.addChild(testActivityDisplay, POSITION_TOP);