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

Commit e6ed04a7 authored by Adam Lesinski's avatar Adam Lesinski Committed by Android Git Automerger
Browse files

am 2dc3c739: am ff5cbab5: Merge "Ensures that CompatibilityInfo is always set... 

am 2dc3c739: am ff5cbab5: Merge "Ensures that CompatibilityInfo is always set in Resources" into klp-dev

* commit '2dc3c739':
  Ensures that CompatibilityInfo is always set in Resources
parents 12f65101 2dc3c739

core/java/android/content/res/Resources.java

+13 −12
Original line number Original line Diff line number Diff line
@@ -195,7 +195,9 @@ public class Resources { 
            CompatibilityInfo compatInfo, IBinder token) {

            CompatibilityInfo compatInfo, IBinder token) {

        mAssets = assets;

        mAssets = assets;

        mMetrics.setToDefaults();

        mMetrics.setToDefaults();

        if (compatInfo != null) {

            mCompatibilityInfo = compatInfo;

            mCompatibilityInfo = compatInfo;

        }

        mToken = new WeakReference<IBinder>(token);

        mToken = new WeakReference<IBinder>(token);

        updateConfiguration(config, metrics);

        updateConfiguration(config, metrics);

        assets.ensureStringBlocks();

        assets.ensureStringBlocks();
@@ -1536,9 +1538,8 @@ public class Resources { 
            // it would be cleaner and more maintainble to just be

            // it would be cleaner and more maintainble to just be

            // consistently dealing with a compatible display everywhere in

            // consistently dealing with a compatible display everywhere in

            // the framework.

            // the framework.

            if (mCompatibilityInfo != null) {

            mCompatibilityInfo.applyToDisplayMetrics(mMetrics);

            mCompatibilityInfo.applyToDisplayMetrics(mMetrics);

            }



            int configChanges = 0xfffffff;

            int configChanges = 0xfffffff;

            if (config != null) {

            if (config != null) {

                mTmpConfig.setTo(config);

                mTmpConfig.setTo(config);
@@ -1546,9 +1547,9 @@ public class Resources { 
                if (density == Configuration.DENSITY_DPI_UNDEFINED) {

                if (density == Configuration.DENSITY_DPI_UNDEFINED) {

                    density = mMetrics.noncompatDensityDpi;

                    density = mMetrics.noncompatDensityDpi;

                }

                }

                if (mCompatibilityInfo != null) {



                mCompatibilityInfo.applyToConfiguration(density, mTmpConfig);

                mCompatibilityInfo.applyToConfiguration(density, mTmpConfig);

                }



                if (mTmpConfig.locale == null) {

                if (mTmpConfig.locale == null) {

                    mTmpConfig.locale = Locale.getDefault();

                    mTmpConfig.locale = Locale.getDefault();

                    mTmpConfig.setLayoutDirection(mTmpConfig.locale);

                    mTmpConfig.setLayoutDirection(mTmpConfig.locale);
@@ -1697,8 +1698,7 @@ public class Resources { 
     * @hide

     * @hide

     */

     */

    public CompatibilityInfo getCompatibilityInfo() {

    public CompatibilityInfo getCompatibilityInfo() {

        return mCompatibilityInfo != null ? mCompatibilityInfo

        return mCompatibilityInfo;

                : CompatibilityInfo.DEFAULT_COMPATIBILITY_INFO;

    }

    }





    /**

    /**
@@ -1706,9 +1706,11 @@ public class Resources { 
     * @hide

     * @hide

     */

     */

    public void setCompatibilityInfo(CompatibilityInfo ci) {

    public void setCompatibilityInfo(CompatibilityInfo ci) {

        if (ci != null) {

            mCompatibilityInfo = ci;

            mCompatibilityInfo = ci;

            updateConfiguration(mConfiguration, mMetrics);

            updateConfiguration(mConfiguration, mMetrics);

        }

        }

    }

    

    

    /**

    /**

     * Return a resource identifier for the given resource name.  A fully

     * Return a resource identifier for the given resource name.  A fully
@@ -2407,6 +2409,5 @@ public class Resources { 
        mMetrics.setToDefaults();

        mMetrics.setToDefaults();

        updateConfiguration(null, null);

        updateConfiguration(null, null);

        mAssets.ensureStringBlocks();

        mAssets.ensureStringBlocks();

        mCompatibilityInfo = CompatibilityInfo.DEFAULT_COMPATIBILITY_INFO;

    }

    }

}
 
}