commit 5fe1afe9cc24969d25496d57d911e8aae8b3ba7a
author Android (Google) Code Review <android-gerrit@google.com> Mon Aug 17 15:25:23 2009 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Aug 17 15:25:23 2009 -0700
tree 8727a22837ba59fef6ef50391cfbf8ce328f9d98
parent 01f750d6fa03f16ef93802618a6ccf8b353ae8e2
parent 46407d831ef31c0935e6d069198ffb275c840d83

Merge change 21603 into eclair

* changes:
  Fix infinite recursion.

graphics/java/android/graphics/drawable/Drawable.java

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 @@
      * 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 static Drawable createFromResourceStream(Resources res, TypedValue value,
             InputStream is, String srcName) {
-        return createFromResourceStream(res, value, is, srcName);
+        return createFromResourceStream(res, value, is, srcName, null);
     }
 
     /**