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

Commit ceef7461 authored by Andrii Kulian's avatar Andrii Kulian
Browse files

Override process config for cold start on secondary screens 

Some apps use Application context to get display configuration and
metrics for their activities. This leads to incorrect configuration
used for activities on secondary screens. This is an issue on the
application side, but the framework can provide some compatibility -
override process-level config to match the display where the first
activity was launched.

Once an activity in the process is launched on the default display,
stop watching other displays config to preserve compatibility.

Bug: 131179060
Test: atest WmTests:ActivityRecordTests#testSetProcessOverridesConfig
Test: Launch GMail on secondary screen
Change-Id: If76f4a83c708f47fd914da68dd4b7366ffd8b88c
parent a7423ca9

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

+26 −2
Original line number Original line Diff line number Diff line
@@ -1085,6 +1085,22 @@ final class ActivityRecord extends ConfigurationContainer { 
        if (root == this) {

        if (root == this) {

            task.setRootProcess(proc);

            task.setRootProcess(proc);

        }

        }

        // Override the process configuration to match the display where the first activity in

        // the process was launched. This can help with compat issues on secondary displays when

        // apps use Application to obtain configuration or metrics instead of Activity.

        final ActivityDisplay display = getDisplay();

        if (display == null || display.mDisplayId == INVALID_DISPLAY) {

            return;

        }

        if (!proc.hasActivities() && display.mDisplayId != DEFAULT_DISPLAY) {

            proc.registerDisplayConfigurationListenerLocked(display);

        } else if (display.mDisplayId == DEFAULT_DISPLAY) {

            // Once an activity is launched on default display - stop listening for other displays

            // configurations to maintain compatibility with previous platform releases. E.g. when

            // an activity is launched in a Bubble and then moved to default screen, we should match

            // the global device config.

            proc.unregisterDisplayConfigurationListenerLocked();

        }

    }

    }





    boolean hasProcess() {

    boolean hasProcess() {
@@ -3233,7 +3249,7 @@ final class ActivityRecord extends ConfigurationContainer { 
        // Update last reported values.

        // Update last reported values.

        final Configuration newMergedOverrideConfig = getMergedOverrideConfiguration();

        final Configuration newMergedOverrideConfig = getMergedOverrideConfiguration();





        setLastReportedConfiguration(mAtmService.getGlobalConfiguration(), newMergedOverrideConfig);

        setLastReportedConfiguration(getProcessGlobalConfiguration(), newMergedOverrideConfig);





        if (mState == INITIALIZING) {

        if (mState == INITIALIZING) {

            // No need to relaunch or schedule new config for activity that hasn't been launched

            // No need to relaunch or schedule new config for activity that hasn't been launched
@@ -3342,6 +3358,14 @@ final class ActivityRecord extends ConfigurationContainer { 
        return true;

        return true;

    }

    }





    /** Get process configuration, or global config if the process is not set. */

    private Configuration getProcessGlobalConfiguration() {

        if (app != null) {

            return app.getConfiguration();

        }

        return mAtmService.getGlobalConfiguration();

    }



    /**

    /**

     * When assessing a configuration change, decide if the changes flags and the new configurations

     * When assessing a configuration change, decide if the changes flags and the new configurations

     * should cause the Activity to relaunch.

     * should cause the Activity to relaunch.
@@ -3449,7 +3473,7 @@ final class ActivityRecord extends ConfigurationContainer { 
            mStackSupervisor.activityRelaunchingLocked(this);

            mStackSupervisor.activityRelaunchingLocked(this);

            final ClientTransactionItem callbackItem = ActivityRelaunchItem.obtain(pendingResults,

            final ClientTransactionItem callbackItem = ActivityRelaunchItem.obtain(pendingResults,

                    pendingNewIntents, configChangeFlags,

                    pendingNewIntents, configChangeFlags,

                    new MergedConfiguration(mAtmService.getGlobalConfiguration(),

                    new MergedConfiguration(getProcessGlobalConfiguration(),

                            getMergedOverrideConfiguration()),

                            getMergedOverrideConfiguration()),

                    preserveWindow);

                    preserveWindow);

            final ActivityLifecycleItem lifecycleItem;

            final ActivityLifecycleItem lifecycleItem;

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

+65 −1
Original line number Original line Diff line number Diff line
@@ -16,6 +16,8 @@ 




package com.android.server.wm;

package com.android.server.wm;





import static android.app.WindowConfiguration.ACTIVITY_TYPE_STANDARD;

import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED;

import static android.view.Display.DEFAULT_DISPLAY;

import static android.view.Display.DEFAULT_DISPLAY;

import static android.view.Surface.ROTATION_0;

import static android.view.Surface.ROTATION_0;

import static android.view.Surface.ROTATION_90;

import static android.view.Surface.ROTATION_90;
@@ -38,6 +40,7 @@ import static com.android.server.wm.ActivityStack.REMOVE_TASK_MODE_MOVING; 
import static com.android.server.wm.ActivityStack.STACK_VISIBILITY_INVISIBLE;

import static com.android.server.wm.ActivityStack.STACK_VISIBILITY_INVISIBLE;

import static com.android.server.wm.ActivityStack.STACK_VISIBILITY_VISIBLE;

import static com.android.server.wm.ActivityStack.STACK_VISIBILITY_VISIBLE;

import static com.android.server.wm.ActivityStack.STACK_VISIBILITY_VISIBLE_BEHIND_TRANSLUCENT;

import static com.android.server.wm.ActivityStack.STACK_VISIBILITY_VISIBLE_BEHIND_TRANSLUCENT;

import static com.android.server.wm.WindowContainer.POSITION_TOP;





import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertFalse;

import static org.junit.Assert.assertFalse;
@@ -56,10 +59,10 @@ import android.app.servertransaction.PauseActivityItem; 
import android.content.pm.ActivityInfo;

import android.content.pm.ActivityInfo;

import android.content.res.Configuration;

import android.content.res.Configuration;

import android.graphics.Rect;

import android.graphics.Rect;

import android.os.RemoteException;

import android.platform.test.annotations.Presubmit;

import android.platform.test.annotations.Presubmit;

import android.util.MergedConfiguration;

import android.util.MergedConfiguration;

import android.util.MutableBoolean;

import android.util.MutableBoolean;

import android.view.DisplayInfo;

import android.view.IRemoteAnimationFinishedCallback;

import android.view.IRemoteAnimationFinishedCallback;

import android.view.IRemoteAnimationRunner.Stub;

import android.view.IRemoteAnimationRunner.Stub;

import android.view.RemoteAnimationAdapter;

import android.view.RemoteAnimationAdapter;
@@ -598,6 +601,67 @@ public class ActivityRecordTests extends ActivityTestsBase { 
        assertNull(mActivity.pendingOptions);

        assertNull(mActivity.pendingOptions);

    }

    }





    @Test

    public void testSetProcessOverridesConfig() {

        final ActivityRecord defaultDisplayActivity =

                createActivityOnDisplay(true /* defaultDisplay */, null /* process */);

        assertFalse(defaultDisplayActivity.app.registeredForDisplayConfigChanges());



        final ActivityRecord secondaryDisplayActivity =

                createActivityOnDisplay(false /* defaultDisplay */, null /* process */);

        assertTrue(secondaryDisplayActivity.app.registeredForDisplayConfigChanges());

        assertEquals(secondaryDisplayActivity.getDisplay().getResolvedOverrideConfiguration(),

                secondaryDisplayActivity.app.getRequestedOverrideConfiguration());



        assertNotEquals(defaultDisplayActivity.getConfiguration(),

                secondaryDisplayActivity.getConfiguration());

    }



    @Test

    public void testSetProcessDoesntOverrideConfigIfAnotherActivityPresent() {

        final ActivityRecord defaultDisplayActivity =

                createActivityOnDisplay(true /* defaultDisplay */, null /* process */);

        assertFalse(defaultDisplayActivity.app.registeredForDisplayConfigChanges());



        final ActivityRecord secondaryDisplayActivity =

                createActivityOnDisplay(false /* defaultDisplay */, defaultDisplayActivity.app);

        assertFalse(secondaryDisplayActivity.app.registeredForDisplayConfigChanges());

    }



    @Test

    public void testActivityOnDefaultDisplayClearsProcessOverride() {

        final ActivityRecord secondaryDisplayActivity =

                createActivityOnDisplay(false /* defaultDisplay */, null /* process */);

        assertTrue(secondaryDisplayActivity.app.registeredForDisplayConfigChanges());



        final ActivityRecord defaultDisplayActivity =

                createActivityOnDisplay(true /* defaultDisplay */,

                        secondaryDisplayActivity.app);

        assertFalse(defaultDisplayActivity.app.registeredForDisplayConfigChanges());

        assertFalse(secondaryDisplayActivity.app.registeredForDisplayConfigChanges());

    }



    /**

     * Creates an activity on display. For non-default display request it will also create a new

     * display with custom DisplayInfo.

     */

    private ActivityRecord createActivityOnDisplay(boolean defaultDisplay,

            WindowProcessController process) {

        final ActivityDisplay display;

        if (defaultDisplay) {

            display = mRootActivityContainer.getDefaultDisplay();

        } else {

            final DisplayInfo info = new DisplayInfo();

            info.logicalWidth = 100;

            info.logicalHeight = 100;

            display = addNewActivityDisplayAt(info, POSITION_TOP);

        }

        final TestActivityStack stack = display.createStack(WINDOWING_MODE_UNDEFINED,

                ACTIVITY_TYPE_STANDARD, true /* onTop */);

        final TaskRecord task = new TaskBuilder(mSupervisor).setStack(stack).build();

        return new ActivityBuilder(mService).setTask(task).setUseProcess(process).build();

    }



    /** Setup {@link #mActivity} as a size-compat-mode-able activity without fixed orientation. */

    /** Setup {@link #mActivity} as a size-compat-mode-able activity without fixed orientation. */

    private void prepareFixedAspectRatioUnresizableActivity() {

    private void prepareFixedAspectRatioUnresizableActivity() {

        setupDisplayContentForCompatDisplayInsets();

        setupDisplayContentForCompatDisplayInsets();

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

+17 −5
Original line number Original line Diff line number Diff line
@@ -195,6 +195,7 @@ class ActivityTestsBase { 
        private ActivityStack mStack;

        private ActivityStack mStack;

        private int mActivityFlags;

        private int mActivityFlags;

        private int mLaunchMode;

        private int mLaunchMode;

        private WindowProcessController mWpc;





        ActivityBuilder(ActivityTaskManagerService service) {

        ActivityBuilder(ActivityTaskManagerService service) {

            mService = service;

            mService = service;
@@ -245,6 +246,11 @@ class ActivityTestsBase { 
            return this;

            return this;

        }

        }





        ActivityBuilder setUseProcess(WindowProcessController wpc) {

            mWpc = wpc;

            return this;

        }



        ActivityRecord build() {

        ActivityRecord build() {

            if (mComponent == null) {

            if (mComponent == null) {

                final int id = sCurrentActivityId++;

                final int id = sCurrentActivityId++;
@@ -290,12 +296,18 @@ class ActivityTestsBase { 
                mTaskRecord.addActivityToTop(activity);

                mTaskRecord.addActivityToTop(activity);

            }

            }





            final WindowProcessController wpc = new WindowProcessController(mService,

            final WindowProcessController wpc;

            if (mWpc != null) {

                wpc = mWpc;

            } else {

                wpc = new WindowProcessController(mService,

                        mService.mContext.getApplicationInfo(), "name", 12345,

                        mService.mContext.getApplicationInfo(), "name", 12345,

                        UserHandle.getUserId(12345), mock(Object.class),

                        UserHandle.getUserId(12345), mock(Object.class),

                        mock(WindowProcessListener.class));

                        mock(WindowProcessListener.class));

                wpc.setThread(mock(IApplicationThread.class));

                wpc.setThread(mock(IApplicationThread.class));

            }

            activity.setProcess(wpc);

            activity.setProcess(wpc);

            wpc.addActivityIfNeeded(activity);

            return activity;

            return activity;

        }

        }

    }

    }

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

+0 −2
Original line number Original line Diff line number Diff line
@@ -153,7 +153,6 @@ public class AppWindowTokenTests extends WindowTestsBase { 
    @FlakyTest(bugId = 131005232)

    @FlakyTest(bugId = 131005232)

    public void testLandscapeSeascapeRotationByApp() {

    public void testLandscapeSeascapeRotationByApp() {

        // Some plumbing to get the service ready for rotation updates.

        // Some plumbing to get the service ready for rotation updates.

        mWm.mDisplayReady = true;

        mWm.mDisplayEnabled = true;

        mWm.mDisplayEnabled = true;





        final WindowManager.LayoutParams attrs = new WindowManager.LayoutParams(

        final WindowManager.LayoutParams attrs = new WindowManager.LayoutParams(
@@ -186,7 +185,6 @@ public class AppWindowTokenTests extends WindowTestsBase { 
    @Test

    @Test

    public void testLandscapeSeascapeRotationByPolicy() {

    public void testLandscapeSeascapeRotationByPolicy() {

        // Some plumbing to get the service ready for rotation updates.

        // Some plumbing to get the service ready for rotation updates.

        mWm.mDisplayReady = true;

        mWm.mDisplayEnabled = true;

        mWm.mDisplayEnabled = true;





        final DisplayRotation spiedRotation = spy(mDisplayContent.getDisplayRotation());

        final DisplayRotation spiedRotation = spy(mDisplayContent.getDisplayRotation());

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

+7 −0
Original line number Original line Diff line number Diff line
@@ -41,6 +41,7 @@ import android.content.BroadcastReceiver; 
import android.content.ContentResolver;

import android.content.ContentResolver;

import android.content.Context;

import android.content.Context;

import android.content.IntentFilter;

import android.content.IntentFilter;

import android.content.res.Configuration;

import android.database.ContentObserver;

import android.database.ContentObserver;

import android.hardware.display.DisplayManagerInternal;

import android.hardware.display.DisplayManagerInternal;

import android.net.Uri;

import android.net.Uri;
@@ -175,6 +176,12 @@ public class SystemServicesTestRule implements TestRule { 
        // Display creation is driven by the ActivityManagerService via

        // Display creation is driven by the ActivityManagerService via

        // ActivityStackSupervisor. We emulate those steps here.

        // ActivityStackSupervisor. We emulate those steps here.

        mWindowManagerService.mRoot.createDisplayContent(display, mock(ActivityDisplay.class));

        mWindowManagerService.mRoot.createDisplayContent(display, mock(ActivityDisplay.class));

        mWindowManagerService.displayReady();



        final Configuration defaultDisplayConfig =

                mWindowManagerService.computeNewConfiguration(DEFAULT_DISPLAY);

        doReturn(defaultDisplayConfig).when(atms).getGlobalConfiguration();

        doReturn(defaultDisplayConfig).when(atms).getGlobalConfigurationForPid(anyInt());





        mMockTracker.stopTracking();

        mMockTracker.stopTracking();

    }

    }