diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-08-17 15:25:23 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-08-17 15:25:23 -0700 |
| commit | 5fe1afe9cc24969d25496d57d911e8aae8b3ba7a (patch) | |
| tree | 8727a22837ba59fef6ef50391cfbf8ce328f9d98 /graphics | |
| parent | 01f750d6fa03f16ef93802618a6ccf8b353ae8e2 (diff) | |
| parent | 46407d831ef31c0935e6d069198ffb275c840d83 (diff) | |
| download | frameworks_base-5fe1afe9cc24969d25496d57d911e8aae8b3ba7a.zip frameworks_base-5fe1afe9cc24969d25496d57d911e8aae8b3ba7a.tar.gz frameworks_base-5fe1afe9cc24969d25496d57d911e8aae8b3ba7a.tar.bz2 | |
Merge change 21603 into eclair
* changes:
Fix infinite recursion.
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/java/android/graphics/drawable/Drawable.java | 4 |
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); } /** |