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

Merge change 21603 into eclair

Browse Source 
* changes:
  Fix infinite recursion.
This commit is contained in:
Android (Google) Code Review
2009-08-17 15:25:23 -07:00
parent 01f750d6fa 46407d831e
commit 5fe1afe9cc
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
graphics/java/android/graphics/drawable/Drawable.java
View File

@@ -654,7 +654,7 @@ public abstract class Drawable {
* Create a drawable from an inputstream * Create a drawable from an inputstream
*/ */
public static Drawable createFromStream(InputStream is, String srcName) { 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, public static Drawable createFromResourceStream(Resources res, TypedValue value,
InputStream is, String srcName) { InputStream is, String srcName) {
return createFromResourceStream(res, value, is, srcName); return createFromResourceStream(res, value, is, srcName, null);
} }
/** /**