Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5fe1afe9 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 21603 into eclair 

* changes:
  Fix infinite recursion.
parents 01f750d6 46407d83

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

+2 −2
Original line number Diff line number Diff line
@@ -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);

    }



    /**