diff options
| author | Jeff Tinker <jtinker@google.com> | 2014-04-03 11:51:37 -0700 |
|---|---|---|
| committer | Jeff Tinker <jtinker@google.com> | 2014-04-03 11:51:37 -0700 |
| commit | 9de8c1d82b6bf2b70e854a3349c9f1da60a23e83 (patch) | |
| tree | 0bfae2ba1d400a49c040ce869527055a25ca2025 /media/jni | |
| parent | ef4c0c9fd5db395b2eea0a246b93bce9cc9e859a (diff) | |
| download | frameworks_base-9de8c1d82b6bf2b70e854a3349c9f1da60a23e83.zip frameworks_base-9de8c1d82b6bf2b70e854a3349c9f1da60a23e83.tar.gz frameworks_base-9de8c1d82b6bf2b70e854a3349c9f1da60a23e83.tar.bz2 | |
resolved conflicts for merge of 4f342e87 to master
Change-Id: I2cdb238759beb49fede2de703df8defee92d316f
Diffstat (limited to 'media/jni')
| -rw-r--r-- | media/jni/android_media_MediaDrm.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/media/jni/android_media_MediaDrm.cpp b/media/jni/android_media_MediaDrm.cpp index 1dbaa3a..7c45682 100644 --- a/media/jni/android_media_MediaDrm.cpp +++ b/media/jni/android_media_MediaDrm.cpp @@ -570,7 +570,7 @@ static void android_media_MediaDrm_native_init(JNIEnv *env) { FIND_CLASS(clazz, "android/media/MediaDrm$Certificate"); GET_FIELD_ID(gFields.certificate.wrappedPrivateKey, clazz, "mWrappedKey", "[B"); GET_FIELD_ID(gFields.certificate.certificateData, clazz, "mCertificateData", "[B"); - gFields.certificateClassId = reinterpret_cast<jclass>(env->NewGlobalRef(clazz)); + gFields.certificateClassId = static_cast<jclass>(env->NewGlobalRef(clazz)); FIND_CLASS(clazz, "java/util/ArrayList"); GET_METHOD_ID(gFields.arraylist.init, clazz, "<init>", "()V"); @@ -595,13 +595,13 @@ static void android_media_MediaDrm_native_init(JNIEnv *env) { GET_METHOD_ID(gFields.entry.getValue, clazz, "getValue", "()Ljava/lang/Object;"); FIND_CLASS(clazz, "java/util/HashMap"); - gFields.hashmapClassId = reinterpret_cast<jclass>(env->NewGlobalRef(clazz)); + gFields.hashmapClassId = static_cast<jclass>(env->NewGlobalRef(clazz)); FIND_CLASS(clazz, "java/lang/String"); - gFields.stringClassId = reinterpret_cast<jclass>(env->NewGlobalRef(clazz)); + gFields.stringClassId = static_cast<jclass>(env->NewGlobalRef(clazz)); FIND_CLASS(clazz, "java/util/ArrayList"); - gFields.arraylistClassId = reinterpret_cast<jclass>(env->NewGlobalRef(clazz)); + gFields.arraylistClassId = static_cast<jclass>(env->NewGlobalRef(clazz)); } static void android_media_MediaDrm_native_setup( |