commit ad4cd5c0102094095f2c7a4622c80a659caacda1
author Wonsik Kim <wonsik@google.com> Tue Mar 31 22:31:44 2020 -0700
committer Wonsik Kim <wonsik@google.com> Tue Mar 31 22:31:44 2020 -0700
tree 7c39ffefeafa48c6b626e36de0eab8ead78466a7
parent c068acb6aeb3d86226f8eaccad7ddee8d4dfd8db

media: fix MediaCodec JNI method signatures

Bug: 152617893
Bug: 152617368
Test: atest CtsMediaTestCases:MediaCodecBlockModelTest
Change-Id: I04cc955df4f27da0c5f8abe18efc6f2a8aa9a065

media/jni/android_media_MediaCodec.cpp

diff --git a/media/jni/android_media_MediaCodec.cpp b/media/jni/android_media_MediaCodec.cpp
index fc9b91c..a5a8445 100644
--- a/media/jni/android_media_MediaCodec.cpp
+++ b/media/jni/android_media_MediaCodec.cpp
@@ -2526,7 +2526,7 @@
     codec->selectAudioPresentation((int32_t)presentationId, (int32_t)programId);
 }
 
-static void android_media_MediaCodec_native_init(JNIEnv *env) {
+static void android_media_MediaCodec_native_init(JNIEnv *env, jclass) {
     ScopedLocalRef<jclass> clazz(
             env, env->FindClass("android/media/MediaCodec"));
     CHECK(clazz.get() != NULL);
@@ -2983,7 +2983,7 @@
 }
 
 static jboolean android_media_MediaCodec_LinearBlock_checkCompatible(
-        JNIEnv *env, jobjectArray codecNames) {
+        JNIEnv *env, jclass, jobjectArray codecNames) {
     std::vector<std::string> names;
     PopulateNamesVector(env, codecNames, &names);
     bool isCompatible = false;