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

am 76afe3e5: Merge "Remove dead code referencing an obsolete interface." into honeycomb

Browse Source 
* commit '76afe3e5cdf3a531835d349a6ab04f2fe82e3958':
  Remove dead code referencing an obsolete interface.
This commit is contained in:
Carl Shapiro
2011-01-21 16:13:29 -08:00
committed by Android Git Automerger
parent ed38013dc1 76afe3e5cd
commit 8513cf6ff2
1 changed files with 0 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
media/jni/android_media_MediaMetadataRetriever.cpp
View File

@@ -343,22 +343,6 @@ static void android_media_MediaMetadataRetriever_native_init(JNIEnv *env)
jniThrowException(env, "java/lang/RuntimeException", "Can't find android/graphics/Bitmap"); jniThrowException(env, "java/lang/RuntimeException", "Can't find android/graphics/Bitmap");
return; return;
} }
#if USE_PRIVATE_NATIVE_BITMAP_CONSTUCTOR
fields.bitmapConstructor = env->GetMethodID(fields.bitmapClazz, "<init>", "(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 = fields.createBitmapMethod =
env->GetStaticMethodID(fields.bitmapClazz, "createBitmap", env->GetStaticMethodID(fields.bitmapClazz, "createBitmap",
"(IILandroid/graphics/Bitmap$Config;)" "(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"); "Can't find Bitmap$Config.nativeToConfig(int) method");
return; return;
} }
#endif
} }
static void android_media_MediaMetadataRetriever_native_setup(JNIEnv *env, jobject thiz) static void android_media_MediaMetadataRetriever_native_setup(JNIEnv *env, jobject thiz)