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

Commit 4fc3d2f0 authored by repo sync . build/envsetup.sh lunch passion-eng's avatar repo sync . build/envsetup.sh lunch passion-eng
Browse files

DO NOT MERGE 

This is a manual cherrypick of:
Change I3a76de15: Fixing font scale in WindowManagerService. There was
a bug that causes WindowManagerService to lose the fontScale setting.

Change-Id: I9b993e11f6a3e75735d8ed05596083893543d732
parent 68ef7f3c

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

+4 −1
Original line number Diff line number Diff line
@@ -3102,8 +3102,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;