Merge change 5826 into donut (9848f11f) · Commits · e / os / android_frameworks_base

graphics/java/android/graphics/NinePatch.java

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -57,7 +57,9 @@ public class NinePatch {
	mBitmap = patch.mBitmap;		mBitmap = patch.mBitmap;
	mChunk = patch.mChunk;		mChunk = patch.mChunk;
	mSrcName = patch.mSrcName;		mSrcName = patch.mSrcName;
			if (patch.mPaint != null) {
	mPaint = new Paint(patch.mPaint);		mPaint = new Paint(patch.mPaint);
			}
	validateNinePatchChunk(mBitmap.ni(), mChunk);		validateNinePatchChunk(mBitmap.ni(), mChunk);
	}		}

	@@ -120,7 +122,6 @@ public class NinePatch {

	public native static boolean isNinePatchChunk(byte[] chunk);		public native static boolean isNinePatchChunk(byte[] chunk);

	private final Rect mRect = new Rect();
	private final Bitmap mBitmap;		private final Bitmap mBitmap;
	private final byte[] mChunk;		private final byte[] mChunk;
	private Paint mPaint;		private Paint mPaint;