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

Commit 8c665807 authored by repo sync . build/envsetup.sh lunch passion-en's avatar repo sync . build/envsetup.sh lunch passion-en Committed by Android Git Automerger
Browse files

am 4fc3d2f0: DO NOT MERGE 

Merge commit '4fc3d2f0' into gingerbread-plus-aosp

* commit '4fc3d2f0':
  DO NOT MERGE
parents 2a36a778 4fc3d2f0

services/java/com/android/server/WindowManagerService.java

+4 −1
Original line number Diff line number Diff line
@@ -3103,8 +3103,11 @@ public class WindowManagerService extends IWindowManager.Stub 
                

            } else if (currentConfig != null) {

                // 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.fontScale = currentConfig.fontScale;

                if (computeNewConfigurationLocked(mTempConfiguration)) {

                    if (currentConfig.diff(mTempConfiguration) != 0) {

                        mWaitingForConfig = true;