commit ff7fffab23357cf81eb5f7ad50615f276510ae61
author Romain Guy <romainguy@google.com> Tue Aug 02 12:38:42 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Aug 02 12:38:42 2011 -0700
tree 91a887b1076c1ceffe19eb22fa3eee841c150749
parent 94761d396d2308bfd93ed03d86c55e7a2b46a59e
parent b1216dd916e0f5fdec29684120c5bcc904800916

Merge "Copy constructors should actually copy stuff. Bug #5027094"

graphics/java/android/graphics/Paint.java

diff --git a/graphics/java/android/graphics/Paint.java b/graphics/java/android/graphics/Paint.java
index 962f22c..163bd4a 100644
--- a/graphics/java/android/graphics/Paint.java
+++ b/graphics/java/android/graphics/Paint.java
@@ -349,6 +349,18 @@
         mCompatScaling = paint.mCompatScaling;
         mInvCompatScaling = paint.mInvCompatScaling;
         mBidiFlags = paint.mBidiFlags;
+        hasShadow = paint.hasShadow;
+        mColorFilter = paint.mColorFilter;
+        mMaskFilter = paint.mMaskFilter;
+        mPathEffect = paint.mPathEffect;
+        mRasterizer = paint.mRasterizer;
+        mShader = paint.mShader;
+        mTypeface = paint.mTypeface;
+        mXfermode = paint.mXfermode;
+        shadowColor = paint.shadowColor;
+        shadowDx = paint.shadowDx;
+        shadowDy = paint.shadowDy;
+        shadowRadius = paint.shadowRadius;
     }
 
     /** Restores the paint to its default settings. */
@@ -1932,7 +1944,11 @@
     
     @Override
     protected void finalize() throws Throwable {
-        finalizer(mNativePaint);
+        try {
+            finalizer(mNativePaint);
+        } finally {
+            super.finalize();
+        }
     }
 
     private static native int native_init();

graphics/java/android/graphics/drawable/BitmapDrawable.java

diff --git a/graphics/java/android/graphics/drawable/BitmapDrawable.java b/graphics/java/android/graphics/drawable/BitmapDrawable.java
index 7e03e1c..87421b1 100644
--- a/graphics/java/android/graphics/drawable/BitmapDrawable.java
+++ b/graphics/java/android/graphics/drawable/BitmapDrawable.java
@@ -20,18 +20,16 @@
 import android.content.res.TypedArray;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
+import android.graphics.BitmapShader;
 import android.graphics.Canvas;
 import android.graphics.ColorFilter;
 import android.graphics.Paint;
 import android.graphics.PixelFormat;
 import android.graphics.Rect;
 import android.graphics.Shader;
-import android.graphics.BitmapShader;
 import android.util.AttributeSet;
 import android.util.DisplayMetrics;
 import android.view.Gravity;
-import android.view.View;
-
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;