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

Commit dd911a33 authored by Tiger Huang's avatar Tiger Huang Committed by Android (Google) Code Review
Browse files

Merge "Use mMergedConfig instead of mGlobalConfig while getting winConfigFromWm" into main

parents 8a460d3c 5f5678d8

core/java/android/view/ViewRootImpl.java

+4 −2
Original line number Diff line number Diff line
@@ -6544,7 +6544,7 @@ public final class ViewRootImpl implements ViewParent, 
        }















        Configuration globalConfig = mergedConfiguration.getGlobalConfiguration();













        final Configuration overrideConfig = mergedConfiguration.getOverrideConfiguration();













        Configuration overrideConfig = mergedConfiguration.getOverrideConfiguration();















        if (DEBUG_CONFIGURATION) Log.v(mTag,















                "Applying new config to window " + mWindowAttributes.getTitle()















                        + ", globalConfig: " + globalConfig









@@ -6553,7 +6553,9 @@ public final class ViewRootImpl implements ViewParent,













        final CompatibilityInfo ci = mDisplay.getDisplayAdjustments().getCompatibilityInfo();















        if (!ci.equals(CompatibilityInfo.DEFAULT_COMPATIBILITY_INFO)) {















            globalConfig = new Configuration(globalConfig);













            overrideConfig = new Configuration(overrideConfig);















            ci.applyToConfiguration(mNoncompatDensity, globalConfig);













            ci.applyToConfiguration(mNoncompatDensity, overrideConfig);















        }





























        synchronized (sConfigCallbacks) {










@@ -9323,7 +9325,7 @@ public final class ViewRootImpl implements ViewParent,













            boolean insetsPending) throws RemoteException {















        final WindowConfiguration winConfigFromAm = getConfiguration().windowConfiguration;















        final WindowConfiguration winConfigFromWm =













                mLastReportedMergedConfiguration.getGlobalConfiguration().windowConfiguration;













                mLastReportedMergedConfiguration.getMergedConfiguration().windowConfiguration;















        final WindowConfiguration winConfig = getCompatWindowConfiguration();















        final int measuredWidth = mMeasuredWidth;















        final int measuredHeight = mMeasuredHeight;