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

Commit f07477df authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [2757224] into oc-mr1-release 

Change-Id: Icf0d816b0e4d67c8261eb5753eca8659baa1e368
parents 769ad3b7 2079d6d6

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

+6 −14
Original line number Diff line number Diff line
@@ -947,8 +947,6 @@ final class ActivityRecord extends ConfigurationContainer implements AppWindowCo 
        // the user leaves that mode.

        mLastReportedMultiWindowMode = !task.mFullscreen;

        mLastReportedPictureInPictureMode = (task.getStackId() == PINNED_STACK_ID);



        onOverrideConfigurationSent();

    }



    void removeWindowContainer() {
@@ -2212,15 +2210,12 @@ final class ActivityRecord extends ConfigurationContainer implements AppWindowCo 
     * a new merged configuration is sent to the client for this activity.

     */

    void setLastReportedConfiguration(@NonNull MergedConfiguration config) {

        mLastReportedConfiguration.setTo(config);

        setLastReportedConfiguration(config.getGlobalConfiguration(),

            config.getOverrideConfiguration());

    }



    /** Call when override config was sent to the Window Manager to update internal records. */

    // TODO(b/36505427): Why do we set last reported based on sending the config to WM? Seems like

    // we should only set this when we actually report to the activity which is what the method

    // setLastReportedMergedOverrideConfiguration() does. Investigate if this is really needed.

    void onOverrideConfigurationSent() {

        mLastReportedConfiguration.setOverrideConfiguration(getMergedOverrideConfiguration());

    void setLastReportedConfiguration(Configuration global, Configuration override) {

        mLastReportedConfiguration.setConfiguration(global, override);

    }



    @Override
@@ -2234,9 +2229,6 @@ final class ActivityRecord extends ConfigurationContainer implements AppWindowCo 
            return;

        }

        mWindowContainerController.onOverrideConfigurationChanged(newConfig, mBounds);

        // TODO(b/36505427): Can we consolidate the call points of onOverrideConfigurationSent()

        // to just use this method instead?

        onOverrideConfigurationSent();

    }



    // TODO(b/36505427): Consider moving this method and similar ones to ConfigurationContainer.
@@ -2423,8 +2415,8 @@ final class ActivityRecord extends ConfigurationContainer implements AppWindowCo 


        // Update last reported values.

        final Configuration newMergedOverrideConfig = getMergedOverrideConfiguration();

        mLastReportedConfiguration.setConfiguration(service.getGlobalConfiguration(),

                newMergedOverrideConfig);



        setLastReportedConfiguration(service.getGlobalConfiguration(), newMergedOverrideConfig);



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

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

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

+0 −1
Original line number Diff line number Diff line
@@ -1293,7 +1293,6 @@ final class TaskRecord extends ConfigurationContainer implements TaskWindowConta 
            // created controller for the activity we are starting yet.

            mWindowContainerController.positionChildAt(appController, index);

        }

        r.onOverrideConfigurationSent();



        // Make sure the list of display UID whitelists is updated

        // now that this record is in a new task.