From 9192d5e8d78b826a665ce048c007e6eaf0f5b003 Mon Sep 17 00:00:00 2001 From: John Reck Date: Mon, 31 Oct 2016 10:32:09 -0700 Subject: [PATCH] Remove unused method Test: builds Change-Id: I8ad660f083a57f30db5ed0e2fe777286720033ca --- core/jni/android/graphics/Bitmap.cpp | 10 +--------- graphics/java/android/graphics/Bitmap.java | 11 ----------- .../bridge/src/android/graphics/Canvas_Delegate.java | 2 +- 3 files changed, 2 insertions(+), 21 deletions(-) diff --git a/core/jni/android/graphics/Bitmap.cpp b/core/jni/android/graphics/Bitmap.cpp index 467ec37fca46f..a47062e4c8288 100755 --- a/core/jni/android/graphics/Bitmap.cpp +++ b/core/jni/android/graphics/Bitmap.cpp @@ -1195,13 +1195,6 @@ static jboolean Bitmap_sameAs(JNIEnv* env, jobject, jlong bm0Handle, return JNI_TRUE; } -static jlong Bitmap_refPixelRef(JNIEnv* env, jobject, jlong bitmapHandle) { - LocalScopedBitmap bitmap(bitmapHandle); - SkPixelRef& pixelRef = bitmap->bitmap(); - pixelRef.ref(); - return reinterpret_cast(&pixelRef); -} - static void Bitmap_prepareToDraw(JNIEnv* env, jobject, jlong bitmapPtr) { LocalScopedBitmap bitmapHandle(bitmapPtr); if (!bitmapHandle.valid()) return; @@ -1269,7 +1262,6 @@ static const JNINativeMethod gBitmapMethods[] = { { "nativeCopyPixelsFromBuffer", "(JLjava/nio/Buffer;)V", (void*)Bitmap_copyPixelsFromBuffer }, { "nativeSameAs", "(JJ)Z", (void*)Bitmap_sameAs }, - { "nativeRefPixelRef", "(J)J", (void*)Bitmap_refPixelRef }, { "nativePrepareToDraw", "(J)V", (void*)Bitmap_prepareToDraw }, { "nativeGetAllocationByteCount", "(J)I", (void*)Bitmap_getAllocationByteCount }, }; @@ -1283,4 +1275,4 @@ int register_android_graphics_Bitmap(JNIEnv* env) gBitmap_getAllocationByteCountMethodID = env->GetMethodID(gBitmap_class, "getAllocationByteCount", "()I"); return android::RegisterMethodsOrDie(env, "android/graphics/Bitmap", gBitmapMethods, NELEM(gBitmapMethods)); -} \ No newline at end of file +} diff --git a/graphics/java/android/graphics/Bitmap.java b/graphics/java/android/graphics/Bitmap.java index fd2f705bfd452..79c63ee306af4 100644 --- a/graphics/java/android/graphics/Bitmap.java +++ b/graphics/java/android/graphics/Bitmap.java @@ -1655,16 +1655,6 @@ public final class Bitmap implements Parcelable { nativePrepareToDraw(mNativePtr); } - /** - * Refs the underlying SkPixelRef and returns a pointer to it. - * - * @hide - * */ - public final long refSkPixelRef() { - checkRecycled("Can't refSkPixelRef on a recycled bitmap!"); - return nativeRefPixelRef(mNativePtr); - } - //////////// native methods private static native Bitmap nativeCreate(int[] colors, int offset, @@ -1721,7 +1711,6 @@ public final class Bitmap implements Parcelable { private static native boolean nativeHasMipMap(long nativeBitmap); private static native void nativeSetHasMipMap(long nativeBitmap, boolean hasMipMap); private static native boolean nativeSameAs(long nativeBitmap0, long nativeBitmap1); - private static native long nativeRefPixelRef(long nativeBitmap); private static native void nativePrepareToDraw(long nativeBitmap); private static native int nativeGetAllocationByteCount(long nativeBitmap); } diff --git a/tools/layoutlib/bridge/src/android/graphics/Canvas_Delegate.java b/tools/layoutlib/bridge/src/android/graphics/Canvas_Delegate.java index fa880f0710c4e..4a4c6c81a77f0 100644 --- a/tools/layoutlib/bridge/src/android/graphics/Canvas_Delegate.java +++ b/tools/layoutlib/bridge/src/android/graphics/Canvas_Delegate.java @@ -123,7 +123,7 @@ public final class Canvas_Delegate { /*package*/ static long initRaster(@Nullable Bitmap bitmap) { long nativeBitmapOrZero = 0; if (bitmap != null) { - nativeBitmapOrZero = bitmap.refSkPixelRef(); + nativeBitmapOrZero = bitmap.getNativeInstance(); } if (nativeBitmapOrZero > 0) { // get the Bitmap from the int