diff options
| author | Andreas Huber <andih@google.com> | 2012-05-02 16:06:09 -0700 |
|---|---|---|
| committer | Andreas Huber <andih@google.com> | 2012-05-03 16:02:29 -0700 |
| commit | 60d610bf103379277a4b29a7ead4f013f6128e4e (patch) | |
| tree | 3bff8658e38cbe8af73dce98e9ab7ac9ba7fb42c /media/jni/android_media_MediaCrypto.cpp | |
| parent | 5380cdc2e1adc8511b05e7623efb44d67be88418 (diff) | |
| download | frameworks_base-60d610bf103379277a4b29a7ead4f013f6128e4e.zip frameworks_base-60d610bf103379277a4b29a7ead4f013f6128e4e.tar.gz frameworks_base-60d610bf103379277a4b29a7ead4f013f6128e4e.tar.bz2 | |
Various changes to Media* APIs requested by the api council.
Change-Id: Iec2f50c99cf5f00a442737231361334e9ab46340
related-to-bug: 6432753
Diffstat (limited to 'media/jni/android_media_MediaCrypto.cpp')
| -rw-r--r-- | media/jni/android_media_MediaCrypto.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/media/jni/android_media_MediaCrypto.cpp b/media/jni/android_media_MediaCrypto.cpp index f4f0953..517a293 100644 --- a/media/jni/android_media_MediaCrypto.cpp +++ b/media/jni/android_media_MediaCrypto.cpp @@ -210,7 +210,7 @@ static void android_media_MediaCrypto_native_setup( if (err != OK) { jniThrowException( env, - "java/lang/RuntimeException", + "android/media/MediaCryptoException", "Failed to instantiate crypto object."); return; } @@ -223,7 +223,7 @@ static void android_media_MediaCrypto_native_finalize( android_media_MediaCrypto_release(env, thiz); } -static jboolean android_media_MediaCrypto_isCryptoSchemeSupported( +static jboolean android_media_MediaCrypto_isCryptoSchemeSupportedNative( JNIEnv *env, jobject thiz, jbyteArray uuidObj) { jsize uuidLength = env->GetArrayLength(uuidObj); @@ -284,8 +284,8 @@ static JNINativeMethod gMethods[] = { { "native_finalize", "()V", (void *)android_media_MediaCrypto_native_finalize }, - { "isCryptoSchemeSupported", "([B)Z", - (void *)android_media_MediaCrypto_isCryptoSchemeSupported }, + { "isCryptoSchemeSupportedNative", "([B)Z", + (void *)android_media_MediaCrypto_isCryptoSchemeSupportedNative }, { "requiresSecureDecoderComponent", "(Ljava/lang/String;)Z", (void *)android_media_MediaCrypto_requiresSecureDecoderComponent }, |