drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Improve resource loading by ~3x" into mnc-dev

Browse Source
This commit is contained in:
John Reck
2015-07-13 21:50:26 +00:00
committed by Android (Google) Code Review
parent 093d8de298 4feb326015
commit f96d9c5421
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/content/res/ColorStateList.java
View File

@ -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;

1
core/java/android/content/res/Resources.java
View File

@ -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;
} }
} }