diff options
| author | Jeff Tinker <jtinker@google.com> | 2014-04-02 12:23:56 -0700 |
|---|---|---|
| committer | Jeff Tinker <jtinker@google.com> | 2014-04-02 16:43:10 -0700 |
| commit | 65c94e695929ffa1aaa49d7b5938b34aaf078b6c (patch) | |
| tree | e8349b6e558379ef090df4b3701d624436ec477f /media/jni | |
| parent | e4095a80b674642e0e0e8f0883dee3b22f32f19a (diff) | |
| download | frameworks_base-65c94e695929ffa1aaa49d7b5938b34aaf078b6c.zip frameworks_base-65c94e695929ffa1aaa49d7b5938b34aaf078b6c.tar.gz frameworks_base-65c94e695929ffa1aaa49d7b5938b34aaf078b6c.tar.bz2 | |
Add signature|system permission to MediaDrm signer APIs
Also addresses style issues noted in post-submit review from
https://googleplex-android-review.git.corp.google.com/#/c/439054/
Change-Id: If177b11dbcc049bc271529c119bc5c36ae0107b5
related-to-bug: 12702350
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( |