am 22d41843: Fix the build, for real
* commit '22d418437e44587cb0fba4353515719453269189':
Fix the build, for real
diff --git a/api/current.txt b/api/current.txt
index 78a84f7..7c05ed6 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -8001,7 +8001,7 @@
method public android.graphics.DrawFilter getDrawFilter();
method public int getHeight();
method public deprecated void getMatrix(android.graphics.Matrix);
- method public final android.graphics.Matrix getMatrix();
+ method public final deprecated android.graphics.Matrix getMatrix();
method public int getMaximumBitmapHeight();
method public int getMaximumBitmapWidth();
method public int getSaveCount();
diff --git a/graphics/java/android/graphics/DrawFilter.java b/graphics/java/android/graphics/DrawFilter.java
index 6b44ed7..1f64539 100644
--- a/graphics/java/android/graphics/DrawFilter.java
+++ b/graphics/java/android/graphics/DrawFilter.java
@@ -28,7 +28,11 @@
/* package */ int mNativeInt; // pointer to native object
protected void finalize() throws Throwable {
- nativeDestructor(mNativeInt);
+ try {
+ nativeDestructor(mNativeInt);
+ } finally {
+ super.finalize();
+ }
}
private static native void nativeDestructor(int nativeDrawFilter);
diff --git a/libs/hwui/DisplayListRenderer.h b/libs/hwui/DisplayListRenderer.h
index dd7ec4f..422184e 100644
--- a/libs/hwui/DisplayListRenderer.h
+++ b/libs/hwui/DisplayListRenderer.h
@@ -422,7 +422,7 @@
return;
}
- SkPaint* paintCopy = mPaintMap.valueFor(paint);
+ SkPaint* paintCopy = mPaintMap.valueFor(paint);
if (paintCopy == NULL || paintCopy->getGenerationID() != paint->getGenerationID()) {
paintCopy = new SkPaint(*paint);
mPaintMap.add(paint, paintCopy);