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

am 9d31e1be: Merge change 26686 into eclair

Browse Source 
Merge commit '9d31e1bebaf3ae5d54751c32466edcea6e7433dd' into eclair-plus-aosp

* commit '9d31e1bebaf3ae5d54751c32466edcea6e7433dd':
  Fix broken build.
This commit is contained in:
Dianne Hackborn
2009-09-23 15:28:53 -07:00
committed by Android Git Automerger
parent b09c63e240 9d31e1beba
commit 74468de20b
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
media/jni/android_media_MediaMetadataRetriever.cpp
View File

@@ -196,7 +196,7 @@ static jobject android_media_MediaMetadataRetriever_captureFrame(JNIEnv *env, jo
// Since internally SkBitmap uses reference count to manage the reference to // Since internally SkBitmap uses reference count to manage the reference to
// its pixels, it is important that the pixels (along with SkBitmap) be // its pixels, it is important that the pixels (along with SkBitmap) be
// available after creating the Bitmap is returned to Java app. // available after creating the Bitmap is returned to Java app.
return env->NewObject(fields.bitmapClazz, fields.bitmapConstructor, (int) bitmap, true, NULL); return env->NewObject(fields.bitmapClazz, fields.bitmapConstructor, (int) bitmap, true, NULL, -1);
} }
static jbyteArray android_media_MediaMetadataRetriever_extractAlbumArt(JNIEnv *env, jobject thiz) static jbyteArray android_media_MediaMetadataRetriever_extractAlbumArt(JNIEnv *env, jobject thiz)
@@ -293,7 +293,7 @@ static void android_media_MediaMetadataRetriever_native_init(JNIEnv *env)
return; return;
} }
fields.bitmapConstructor = env->GetMethodID(fields.bitmapClazz, "<init>", "(IZ[B)V"); fields.bitmapConstructor = env->GetMethodID(fields.bitmapClazz, "<init>", "(IZ[BI)V");
if (fields.bitmapConstructor == NULL) { if (fields.bitmapConstructor == NULL) {
jniThrowException(env, "java/lang/RuntimeException", "Can't find Bitmap constructor"); jniThrowException(env, "java/lang/RuntimeException", "Can't find Bitmap constructor");
return; return;