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

Merge "fix recursion for config change" into nyc-dev

Browse Source 
am: 3279050

* commit '3279050c259279954ca61462689020b0b75feb3b':
  fix recursion for config change

Change-Id: I85a7efa6b8788809134d162ccf475d7e6e54ee06
This commit is contained in:
Keun-young Park
2016-04-27 23:13:30 +00:00
committed by android-build-merger
parent c90a4108b5 3279050c25
commit 2a00cf3d78
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/core/java/com/android/server/wm/WindowManagerService.java
View File

@@ -3625,8 +3625,7 @@ public class WindowManagerService extends IWindowManager.Stub
// disregarding font scale, which should remain set to
// the value of the previous configuration.
mTempConfiguration.setToDefaults();
mTempConfiguration.fontScale = currentConfig.fontScale;
mTempConfiguration.uiMode = currentConfig.uiMode;
mTempConfiguration.updateFrom(currentConfig);
computeScreenConfigurationLocked(mTempConfiguration);
if (currentConfig.diff(mTempConfiguration) != 0) {
mWaitingForConfig = true;
@@ -3689,11 +3688,15 @@ public class WindowManagerService extends IWindowManager.Stub
}
synchronized(mWindowMap) {
mCurConfiguration = new Configuration(config);
if (mWaitingForConfig) {
mWaitingForConfig = false;
mLastFinishedFreezeSource = "new-config";
}
boolean configChanged = mCurConfiguration.diff(config) != 0;
if (!configChanged) {
return null;
}
mCurConfiguration = new Configuration(config);
return onConfigurationChanged();
}
}
@@ -8877,8 +8880,7 @@ public class WindowManagerService extends IWindowManager.Stub
boolean configChanged = updateOrientationFromAppTokensLocked(false);
mTempConfiguration.setToDefaults();
mTempConfiguration.fontScale = mCurConfiguration.fontScale;
mTempConfiguration.uiMode = mCurConfiguration.uiMode;
mTempConfiguration.updateFrom(mCurConfiguration);
computeScreenConfigurationLocked(mTempConfiguration);
configChanged |= mCurConfiguration.diff(mTempConfiguration) != 0;