Merge change 26686 into eclair (9d31e1be) · Commits · e / os / android_frameworks_base

media/jni/android_media_MediaMetadataRetriever.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -196,7 +196,7 @@ static jobject android_media_MediaMetadataRetriever_captureFrame(JNIEnv *env, jo
		// Since internally SkBitmap uses reference count to manage the reference to
		// its pixels, it is important that the pixels (along with SkBitmap) be
		// 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)
		@@ -293,7 +293,7 @@ static void android_media_MediaMetadataRetriever_native_init(JNIEnv *env)
		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) {
		jniThrowException(env, "java/lang/RuntimeException", "Can't find Bitmap constructor");
		return;