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

Commit 0d8ff25f authored by Andrii Kulian's avatar Andrii Kulian
Browse files

Compute merged configuration changes 

When we compute configuration changes to decide whether to relaunch
an activity or just report a coniguration change, we were calculating
task override changes and global changes separately. This results in
incorrect set of detected changes if we're moving between the
displays. E.g. when moving from secondary display to the primary
a lot of override config values change from empty to non-empty.

This CL switches to calculating configuration changes for merged
task configuration (global + overrides).

Bug: 34164473
Test: android.server.cts.ActivityManagerDisplayTests
Test: #testOnMovedToDisplayCallback
Change-Id: Icd6d10a49ab3ef80e00caf92cfd46e491b079d50
parent fbe85538

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

+17 −28
Original line number Original line Diff line number Diff line
@@ -2019,6 +2019,12 @@ final class ActivityRecord implements AppWindowContainerListener { 




        // Okay we now are going to make this activity have the new config.

        // Okay we now are going to make this activity have the new config.

        // But then we need to figure out how it needs to deal with that.

        // But then we need to figure out how it needs to deal with that.



        // Find changes between last reported merged configuration and the current one. This is used

        // to decide whether to relaunch an activity or just report a configuration change.

        final int changes = getTaskConfigurationChanges(mTmpConfig1);



        // Update last reported values.

        final Configuration newGlobalConfig = service.getGlobalConfiguration();

        final Configuration newGlobalConfig = service.getGlobalConfiguration();

        final Configuration newTaskMergedOverrideConfig = task.getMergedOverrideConfiguration();

        final Configuration newTaskMergedOverrideConfig = task.getMergedOverrideConfiguration();

        mTmpConfig1.setTo(mLastReportedConfiguration);

        mTmpConfig1.setTo(mLastReportedConfiguration);
@@ -2026,9 +2032,6 @@ final class ActivityRecord implements AppWindowContainerListener { 
        mLastReportedConfiguration.setTo(newGlobalConfig);

        mLastReportedConfiguration.setTo(newGlobalConfig);

        mLastReportedOverrideConfiguration.setTo(newTaskMergedOverrideConfig);

        mLastReportedOverrideConfiguration.setTo(newTaskMergedOverrideConfig);





        int taskChanges = getTaskConfigurationChanges(this, newTaskMergedOverrideConfig,

                mTmpConfig2);

        final int changes = mTmpConfig1.diff(newGlobalConfig) | taskChanges;

        if (changes == 0 && !forceNewConfig) {

        if (changes == 0 && !forceNewConfig) {

            if (DEBUG_SWITCH || DEBUG_CONFIGURATION) Slog.v(TAG_CONFIGURATION,

            if (DEBUG_SWITCH || DEBUG_CONFIGURATION) Slog.v(TAG_CONFIGURATION,

                    "Configuration no differences in " + this);

                    "Configuration no differences in " + this);
@@ -2043,8 +2046,7 @@ final class ActivityRecord implements AppWindowContainerListener { 
        }

        }





        if (DEBUG_SWITCH || DEBUG_CONFIGURATION) Slog.v(TAG_CONFIGURATION,

        if (DEBUG_SWITCH || DEBUG_CONFIGURATION) Slog.v(TAG_CONFIGURATION,

                "Configuration changes for " + this + " ; taskChanges="

                "Configuration changes for " + this + ", allChanges="

                        + Configuration.configurationDiffToString(taskChanges) + ", allChanges="

                        + Configuration.configurationDiffToString(changes));

                        + Configuration.configurationDiffToString(changes));





        // If the activity isn't currently running, just leave the new configuration and it will

        // If the activity isn't currently running, just leave the new configuration and it will
@@ -2142,40 +2144,27 @@ final class ActivityRecord implements AppWindowContainerListener { 
        return (changes&(~configChanged)) != 0;

        return (changes&(~configChanged)) != 0;

    }

    }





    private static int getTaskConfigurationChanges(ActivityRecord record, Configuration taskConfig,

    private int getTaskConfigurationChanges(Configuration newTaskConfig) {

            Configuration oldTaskOverride) {

        // If we went from full-screen to non-full-screen, make sure to use the correct

        // configuration task diff, so the diff stays as small as possible.

        if (Configuration.EMPTY.equals(oldTaskOverride)

                && !Configuration.EMPTY.equals(taskConfig)) {

            oldTaskOverride = record.task.extractOverrideConfig(record.mLastReportedConfiguration);

        }



        // Conversely, do the same when going the other direction.

        if (Configuration.EMPTY.equals(taskConfig)

                && !Configuration.EMPTY.equals(oldTaskOverride)) {

            taskConfig = record.task.extractOverrideConfig(record.mLastReportedConfiguration);

        }



        // Determine what has changed.  May be nothing, if this is a config that has come back from

        // Determine what has changed.  May be nothing, if this is a config that has come back from

        // the app after going idle.  In that case we just want to leave the official config object

        // the app after going idle.  In that case we just want to leave the official config object

        // now in the activity and do nothing else.

        // now in the activity and do nothing else.

        int taskChanges = oldTaskOverride.diff(taskConfig, true /* skipUndefined */);

        final Configuration oldTaskConfig = task.getConfiguration();

        int taskChanges = oldTaskConfig.diff(newTaskConfig, true /* skipUndefined */);

        // We don't want to use size changes if they don't cross boundaries that are important to

        // We don't want to use size changes if they don't cross boundaries that are important to

        // the app.

        // the app.

        if ((taskChanges & CONFIG_SCREEN_SIZE) != 0) {

        if ((taskChanges & CONFIG_SCREEN_SIZE) != 0) {

            final boolean crosses = record.crossesHorizontalSizeThreshold(

            final boolean crosses = crossesHorizontalSizeThreshold(oldTaskConfig.screenWidthDp,

                    oldTaskOverride.screenWidthDp, taskConfig.screenWidthDp)

                    newTaskConfig.screenWidthDp)

                    || record.crossesVerticalSizeThreshold(

                    || crossesVerticalSizeThreshold(oldTaskConfig.screenHeightDp,

                    oldTaskOverride.screenHeightDp, taskConfig.screenHeightDp);

                    newTaskConfig.screenHeightDp);

            if (!crosses) {

            if (!crosses) {

                taskChanges &= ~CONFIG_SCREEN_SIZE;

                taskChanges &= ~CONFIG_SCREEN_SIZE;

            }

            }

        }

        }

        if ((taskChanges & CONFIG_SMALLEST_SCREEN_SIZE) != 0) {

        if ((taskChanges & CONFIG_SMALLEST_SCREEN_SIZE) != 0) {

            final int oldSmallest = oldTaskOverride.smallestScreenWidthDp;

            final int oldSmallest = oldTaskConfig.smallestScreenWidthDp;

            final int newSmallest = taskConfig.smallestScreenWidthDp;

            final int newSmallest = newTaskConfig.smallestScreenWidthDp;

            if (!record.crossesSmallestSizeThreshold(oldSmallest, newSmallest)) {

            if (!crossesSmallestSizeThreshold(oldSmallest, newSmallest)) {

                taskChanges &= ~CONFIG_SMALLEST_SCREEN_SIZE;

                taskChanges &= ~CONFIG_SMALLEST_SCREEN_SIZE;

            }

            }

        }

        }