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

Commit 5d84b44b authored by John Reck's avatar John Reck Committed by Android Git Automerger
Browse files

am 72e8e080: am 074b3ceb: am f96d9c54: Merge "Improve resource loading by ~3x" into mnc-dev 

* commit '72e8e080':
  Improve resource loading by ~3x
parents 061846d1 72e8e080

core/java/android/content/res/ColorStateList.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -603,7 +603,7 @@ public class ColorStateList implements Parcelable { 
     * @hide only for resource preloading

     * @hide only for resource preloading

     */

     */

    public ConstantState<ColorStateList> getConstantState() {

    public ConstantState<ColorStateList> getConstantState() {

        if (mFactory != null) {

        if (mFactory == null) {

            mFactory = new ColorStateListFactory(this);

            mFactory = new ColorStateListFactory(this);

        }

        }

        return mFactory;

        return mFactory;

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -1918,6 +1918,7 @@ public class Resources { 
            other.mResId = mResId;

            other.mResId = mResId;

            other.mForce = mForce;

            other.mForce = mForce;

            other.mCount = mCount;

            other.mCount = mCount;

            other.mHashCode = mHashCode;

            return other;

            return other;

        }

        }

    }

    }