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

Prevent unhandled exception in NinePatchDrawable

Browse Source 
Added null check in computeBitmapSize() to avoid unhandled
exception "java.lang.NullPointerException" at
android.graphics.Rect.<init>(Rect.java:72).

This problem was discovered in the wild.

Change-Id: I9d40629a052f1390e1811288af6209d8cc3f679b
This commit is contained in:
Sonia Serafimova
2010-09-15 13:18:44 +02:00
committed by Jean-Baptiste Queru
parent beabe75a84
commit d45a33554c
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
graphics/java/android/graphics/drawable/NinePatchDrawable.java
View File

@@ -164,6 +164,7 @@ public class NinePatchDrawable extends Drawable {
sdensity, tdensity); sdensity, tdensity);
mBitmapHeight = Bitmap.scaleFromDensity(mNinePatch.getHeight(), mBitmapHeight = Bitmap.scaleFromDensity(mNinePatch.getHeight(),
sdensity, tdensity); sdensity, tdensity);
if (mNinePatchState.mPadding != null && mPadding != null) {
Rect dest = mPadding; Rect dest = mPadding;
Rect src = mNinePatchState.mPadding; Rect src = mNinePatchState.mPadding;
if (dest == src) { if (dest == src) {
@@ -175,6 +176,7 @@ public class NinePatchDrawable extends Drawable {
dest.bottom = Bitmap.scaleFromDensity(src.bottom, sdensity, tdensity); dest.bottom = Bitmap.scaleFromDensity(src.bottom, sdensity, tdensity);
} }
} }
}
// overrides // overrides