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

Commit ca3f968c authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by Android Git Automerger
Browse files

am 7d9c73fb: Merge "Prevent unhandled exception in NinePatchDrawable" 

Merge commit '7d9c73fb' into gingerbread-plus-aosp

* commit '7d9c73fb':
  Prevent unhandled exception in NinePatchDrawable
parents 74a8df20 7d9c73fb

graphics/java/android/graphics/drawable/NinePatchDrawable.java

+10 −8
Original line number Diff line number Diff line
@@ -164,6 +164,7 @@ public class NinePatchDrawable extends Drawable { 
                    sdensity, tdensity);

            mBitmapHeight = Bitmap.scaleFromDensity(mNinePatch.getHeight(),

                    sdensity, tdensity);

            if (mNinePatchState.mPadding != null && mPadding != null) {

                Rect dest = mPadding;

                Rect src = mNinePatchState.mPadding;

                if (dest == src) {
@@ -175,6 +176,7 @@ public class NinePatchDrawable extends Drawable { 
                dest.bottom = Bitmap.scaleFromDensity(src.bottom, sdensity, tdensity);

            }

        }

    }

    

    // overrides