summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMasanori Ogino <ogino.masanori@sharp.co.jp>2010-07-20 18:55:51 +0900
committerSteve Kondik <shade@chemlab.org>2010-07-24 05:20:11 -0400
commit7ea83199760302f90f97c09b18c3f622d50d802f (patch)
tree684e8db68be1888b85cc754f5418a9e7104c2d87
parentfd54193817f00b9d12081673edd5db4884b16fca (diff)
downloadframeworks_base-7ea83199760302f90f97c09b18c3f622d50d802f.zip
frameworks_base-7ea83199760302f90f97c09b18c3f622d50d802f.tar.gz
frameworks_base-7ea83199760302f90f97c09b18c3f622d50d802f.tar.bz2
Shoud specify the Resource class instance as an argument of the method
newDrawable and change the name from 'DrawableCacheClear' to 'clearDrawableCache' (additional changes for ID:15815) https://review.source.android.com/#change,15815 Change-Id: I6bf19b8e6e187df8c8e3cb57d9e04278ddfe5055
-rwxr-xr-xcore/java/android/content/res/Resources.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/core/java/android/content/res/Resources.java b/core/java/android/content/res/Resources.java
index 01064f1..44e589d 100755
--- a/core/java/android/content/res/Resources.java
+++ b/core/java/android/content/res/Resources.java
@@ -1342,8 +1342,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();
@@ -1357,7 +1357,7 @@ public class Resources {
}
}
- private void drawableCacheClear(
+ private void clearDrawableCache(
LongSparseArray<WeakReference<ConstantState>> cache,
int configChanges) {
int N = cache.size();
@@ -1818,7 +1818,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);