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

am 4fc3d2f0: DO NOT MERGE

Browse Source 
Merge commit '4fc3d2f0b3237390c37ccc4701bc68e4aa5f9b7a' into gingerbread-plus-aosp

* commit '4fc3d2f0b3237390c37ccc4701bc68e4aa5f9b7a':
  DO NOT MERGE
This commit is contained in:
repo sync . build/envsetup.sh lunch passion-en
2010-09-27 17:51:45 -07:00
committed by Android Git Automerger
parent 2a36a778d3 4fc3d2f0b3
commit 8c66580759
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/java/com/android/server/WindowManagerService.java
View File

@@ -3103,8 +3103,11 @@ public class WindowManagerService extends IWindowManager.Stub
} else if (currentConfig != null) { } else if (currentConfig != null) {
// No obvious action we need to take, but if our current // No obvious action we need to take, but if our current
// state mismatches the activity maanager's, update it // state mismatches the activity manager's, update it,
// disregarding font scale, which should remain set to
// the value of the previous configuration.
mTempConfiguration.setToDefaults(); mTempConfiguration.setToDefaults();
mTempConfiguration.fontScale = currentConfig.fontScale;
if (computeNewConfigurationLocked(mTempConfiguration)) { if (computeNewConfigurationLocked(mTempConfiguration)) {
if (currentConfig.diff(mTempConfiguration) != 0) { if (currentConfig.diff(mTempConfiguration) != 0) {
mWaitingForConfig = true; mWaitingForConfig = true;