Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 42ef77f3: merge from open-source master

Browse Source 
Merge commit '42ef77f3603ae54990d6718db79afae61e91dc61'

* commit '42ef77f3603ae54990d6718db79afae61e91dc61':
  Shoud specify the Resource class instance as an argument of the method
This commit is contained in:
The Android Open Source Project
2010-07-21 08:15:45 -07:00
committed by Android Git Automerger
parent 57339e752c 42ef77f360
commit 63ae85f0e1
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1345,8 +1345,8 @@ public class Resources {
keyboardHidden, mConfiguration.navigation, width, height,
mConfiguration.screenLayout, mConfiguration.uiMode, sSdkVersion);
drawableCacheClear(mDrawableCache, configChanges);
drawableCacheClear(mColorDrawableCache, configChanges);
clearDrawableCache(mDrawableCache, configChanges);
clearDrawableCache(mColorDrawableCache, configChanges);
mColorStateListCache.clear();
@@ -1360,7 +1360,7 @@ public class Resources {
}
}
private void drawableCacheClear(
private void clearDrawableCache(
LongSparseArray<WeakReference<ConstantState>> cache,
int configChanges) {
int N = cache.size();
@@ -1821,7 +1821,7 @@ public class Resources {
//Log.i(TAG, "Returning cached drawable @ #" +
// Integer.toHexString(((Integer)key).intValue())
// + " in " + this + ": " + entry);
return entry.newDrawable();
return entry.newDrawable(this);
}
else { // our entry has been purged
drawableCache.delete(key);