diff options
author | Android (Google) Code Review <android-gerrit@google.com> | 2009-06-30 13:34:45 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-06-30 13:34:45 -0700 |
commit | 9848f11fd8788b985330183aeb83cc589b8b14ae (patch) | |
tree | 570efffe5c800498a4f163b8b32463501fc83b58 /graphics | |
parent | b1a975234112cb98ddd5a3ff5f991007eecaff2e (diff) | |
parent | 54285f2cbfb6e307d594ca264f7230b4e1e3cdce (diff) | |
download | frameworks_base-9848f11fd8788b985330183aeb83cc589b8b14ae.zip frameworks_base-9848f11fd8788b985330183aeb83cc589b8b14ae.tar.gz frameworks_base-9848f11fd8788b985330183aeb83cc589b8b14ae.tar.bz2 |
Merge change 5826 into donut
* changes:
Fix NullPointerException in NinePatch constructor
Diffstat (limited to 'graphics')
-rw-r--r-- | graphics/java/android/graphics/NinePatch.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/graphics/java/android/graphics/NinePatch.java b/graphics/java/android/graphics/NinePatch.java index 2b24ef2..778c903 100644 --- a/graphics/java/android/graphics/NinePatch.java +++ b/graphics/java/android/graphics/NinePatch.java @@ -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; |