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

Commit 85f3f7f8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by android-build-merger
Browse files

Merge "Always send configuration changes to activity." into nyc-dev am: 988a20a9 

am: 3e92aba5

* commit '3e92aba5':
  Always send configuration changes to activity.

Change-Id: I58dd440129315593fe03bff3719a16f0d84e1295
parents 462f8180 3e92aba5

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

+5 −5
Original line number Diff line number Diff line
@@ -4362,12 +4362,12 @@ final class ActivityStack { 
        if (DEBUG_SWITCH || DEBUG_CONFIGURATION) Slog.v(TAG_CONFIGURATION,

                "Ensuring correct configuration: " + r);



        // Short circuit: if the two configurations are the exact same

        // object (the common case), then there is nothing to do.

        // Short circuit: if the two configurations are equal (the common case), then there is

        // nothing to do.

        final Configuration newConfig = mService.mConfiguration;

        final Configuration taskConfig = r.task.mOverrideConfig;

        if (r.configuration == newConfig

                && r.taskConfigOverride == taskConfig

        if (r.configuration.equals(newConfig)

                && r.taskConfigOverride.equals(taskConfig)

                && !r.forceNewConfig) {

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

                    "Configuration unchanged in " + r);
@@ -4396,7 +4396,7 @@ final class ActivityStack { 
                    "Configuration no differences in " + r);

            // There are no significant differences, so we won't relaunch but should still deliver

            // the new configuration to the client process.

            r.scheduleConfigurationChanged(taskConfig, false);

            r.scheduleConfigurationChanged(taskConfig, true);

            return true;

        }