am 9848f11f: Merge change 5826 into donut

Merge commit '9848f11fd8788b985330183aeb83cc589b8b14ae'

* commit '9848f11fd8788b985330183aeb83cc589b8b14ae':
  Fix NullPointerException in NinePatch constructor
This commit is contained in:
Android (Google) Code Review
2009-07-01 17:27:46 -07:00
committed by The Android Open Source Project

View File

@@ -57,7 +57,9 @@ public class NinePatch {
mBitmap = patch.mBitmap;
mChunk = patch.mChunk;
mSrcName = patch.mSrcName;
mPaint = new Paint(patch.mPaint);
if (patch.mPaint != null) {
mPaint = new Paint(patch.mPaint);
}
validateNinePatchChunk(mBitmap.ni(), mChunk);
}
@@ -120,7 +122,6 @@ public class NinePatch {
public native static boolean isNinePatchChunk(byte[] chunk);
private final Rect mRect = new Rect();
private final Bitmap mBitmap;
private final byte[] mChunk;
private Paint mPaint;