summaryrefslogtreecommitdiffstats
path: root/graphics/java
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2009-08-17 15:22:29 -0700
committerDianne Hackborn <hackbod@google.com>2009-08-17 15:22:29 -0700
commit46407d831ef31c0935e6d069198ffb275c840d83 (patch)
tree51020ec412ec6456642a700b3cfff6d5026460e6 /graphics/java
parent5e787c42f2a6b3afc8ec8320a08d51b2d44b8614 (diff)
downloadframeworks_base-46407d831ef31c0935e6d069198ffb275c840d83.zip
frameworks_base-46407d831ef31c0935e6d069198ffb275c840d83.tar.gz
frameworks_base-46407d831ef31c0935e6d069198ffb275c840d83.tar.bz2
Fix infinite recursion.
Diffstat (limited to 'graphics/java')
-rw-r--r--graphics/java/android/graphics/drawable/Drawable.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/graphics/java/android/graphics/drawable/Drawable.java b/graphics/java/android/graphics/drawable/Drawable.java
index 33748ae..21b5e39 100644
--- a/graphics/java/android/graphics/drawable/Drawable.java
+++ b/graphics/java/android/graphics/drawable/Drawable.java
@@ -654,7 +654,7 @@ public abstract class Drawable {
* Create a drawable from an inputstream
*/
public static Drawable createFromStream(InputStream is, String srcName) {
- return createFromResourceStream(null, null, is, srcName);
+ return createFromResourceStream(null, null, is, srcName, null);
}
/**
@@ -663,7 +663,7 @@ public abstract class Drawable {
*/
public static Drawable createFromResourceStream(Resources res, TypedValue value,
InputStream is, String srcName) {
- return createFromResourceStream(res, value, is, srcName);
+ return createFromResourceStream(res, value, is, srcName, null);
}
/**