Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove unused method"

Browse Source
This commit is contained in:
John Reck
2016-11-01 16:20:14 +00:00
committed by Android (Google) Code Review
parent e48170bcbb 9192d5e8d7
commit 2ac09fd06d
2 changed files with 1 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/jni/android/graphics/Bitmap.cpp
View File

@@ -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<jlong>(&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));
}
}

11
graphics/java/android/graphics/Bitmap.java
View File

@@ -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);
}