commit fbc7c1a784b3e9b003feaa9bd39d4283b316308e
author Android (Google) Code Review <android-gerrit@google.com> Wed Jul 01 17:27:46 2009 -0700
committer The Android Open Source Project <initial-contribution@android.com> Wed Jul 01 17:27:46 2009 -0700
tree 1ded28b570cdf5980e2c03dc5106caae07cf6a6a
parent 7605bf35568998d5094c68407cd72265409c1a3d
parent 9848f11fd8788b985330183aeb83cc589b8b14ae

am 9848f11f: Merge change 5826 into donut

Merge commit '9848f11fd8788b985330183aeb83cc589b8b14ae'

* commit '9848f11fd8788b985330183aeb83cc589b8b14ae':
  Fix NullPointerException in NinePatch constructor

graphics/java/android/graphics/NinePatch.java

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 @@
         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 native static boolean isNinePatchChunk(byte[] chunk);
 
-    private final Rect   mRect = new Rect();
     private final Bitmap mBitmap;
     private final byte[] mChunk;
     private Paint        mPaint;