Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Always send configuration changes to activity." into nyc-dev

Browse Source 
am: 988a20a

* commit '988a20a94b71c7a8fdffcfbfe0b0ee0dd58854cb':
  Always send configuration changes to activity.

Change-Id: Ibf179c096fcb93d3845951d288d002e200f3e0a3
This commit is contained in:
Wale Ogunwale
2016-04-18 05:50:24 +00:00
committed by android-build-merger
parent 188b0139aa 988a20a94b
commit c6ea9f7736
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/core/java/com/android/server/am/ActivityStack.java
View File

@@ -4362,12 +4362,12 @@ final class ActivityStack {
if (DEBUG_SWITCH || DEBUG_CONFIGURATION) Slog.v(TAG_CONFIGURATION, if (DEBUG_SWITCH || DEBUG_CONFIGURATION) Slog.v(TAG_CONFIGURATION,
"Ensuring correct configuration: " + r); "Ensuring correct configuration: " + r);
// Short circuit: if the two configurations are the exact same // Short circuit: if the two configurations are equal (the common case), then there is
// object (the common case), then there is nothing to do. // nothing to do.
final Configuration newConfig = mService.mConfiguration; final Configuration newConfig = mService.mConfiguration;
final Configuration taskConfig = r.task.mOverrideConfig; final Configuration taskConfig = r.task.mOverrideConfig;
if (r.configuration == newConfig if (r.configuration.equals(newConfig)
&& r.taskConfigOverride == taskConfig && r.taskConfigOverride.equals(taskConfig)
&& !r.forceNewConfig) { && !r.forceNewConfig) {
if (DEBUG_SWITCH || DEBUG_CONFIGURATION) Slog.v(TAG_CONFIGURATION, if (DEBUG_SWITCH || DEBUG_CONFIGURATION) Slog.v(TAG_CONFIGURATION,
"Configuration unchanged in " + r); "Configuration unchanged in " + r);
@@ -4396,7 +4396,7 @@ final class ActivityStack {
"Configuration no differences in " + r); "Configuration no differences in " + r);
// There are no significant differences, so we won't relaunch but should still deliver // There are no significant differences, so we won't relaunch but should still deliver
// the new configuration to the client process. // the new configuration to the client process.
r.scheduleConfigurationChanged(taskConfig, false); r.scheduleConfigurationChanged(taskConfig, true);
return true; return true;
} }