From 8f995b5f6de6690ecf80d40cde70e2e6f6e3f232 Mon Sep 17 00:00:00 2001 From: Carl Shapiro Date: Fri, 21 Jan 2011 12:28:35 -0800 Subject: [PATCH] Remove dead code referencing an obsolete interface. Bug: 3378919 Change-Id: I780d98492ea7996187e3d97fcae7748f7ee68e91 --- .../android_media_MediaMetadataRetriever.cpp | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/media/jni/android_media_MediaMetadataRetriever.cpp b/media/jni/android_media_MediaMetadataRetriever.cpp index 5d14763714844..3d7dbf9dc4523 100644 --- a/media/jni/android_media_MediaMetadataRetriever.cpp +++ b/media/jni/android_media_MediaMetadataRetriever.cpp @@ -343,22 +343,6 @@ static void android_media_MediaMetadataRetriever_native_init(JNIEnv *env) jniThrowException(env, "java/lang/RuntimeException", "Can't find android/graphics/Bitmap"); return; } -#if USE_PRIVATE_NATIVE_BITMAP_CONSTUCTOR - fields.bitmapConstructor = env->GetMethodID(fields.bitmapClazz, "", "(I[BZ[BI)V"); - if (fields.bitmapConstructor == NULL) { - jniThrowException(env, "java/lang/RuntimeException", "Can't find Bitmap constructor"); - return; - } - fields.createBitmapRotationMethod = - env->GetStaticMethodID(fields.bitmapClazz, "createBitmap", - "(Landroid/graphics/Bitmap;IIIILandroid/graphics/Matrix;Z)" - "Landroid/graphics/Bitmap;"); - if (fields.createBitmapRotationMethod == NULL) { - jniThrowException(env, "java/lang/RuntimeException", - "Can't find Bitmap.createBitmap method"); - return; - } -#else fields.createBitmapMethod = env->GetStaticMethodID(fields.bitmapClazz, "createBitmap", "(IILandroid/graphics/Bitmap$Config;)" @@ -388,7 +372,6 @@ static void android_media_MediaMetadataRetriever_native_init(JNIEnv *env) "Can't find Bitmap$Config.nativeToConfig(int) method"); return; } -#endif } static void android_media_MediaMetadataRetriever_native_setup(JNIEnv *env, jobject thiz)