From 952c2a99de929bc873752005dd2bd49078b3574d Mon Sep 17 00:00:00 2001 From: Amy Zhang Date: Thu, 25 Feb 2021 10:44:11 -0800 Subject: [PATCH] Fix MmtpRecordEvent and TsRecordEvent NoSuchMethodError crash in jni Due to Tuner 1.1 extension, these two java classes should have had more parameters in their class descriptors. Test: atest android.media.tv.tuner.cts Bug: 181152149 Change-Id: I6c8e5996a449b272e1b712135f28bee428d776a8 --- media/jni/android_media_tv_Tuner.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/media/jni/android_media_tv_Tuner.cpp b/media/jni/android_media_tv_Tuner.cpp index 4ae68762c08e6..b7cde57beaf56 100644 --- a/media/jni/android_media_tv_Tuner.cpp +++ b/media/jni/android_media_tv_Tuner.cpp @@ -561,7 +561,7 @@ jobjectArray FilterClientCallbackImpl::getTsRecordEvent( const std::vector& eventsExt) { JNIEnv *env = AndroidRuntime::getJNIEnv(); jclass eventClazz = env->FindClass("android/media/tv/tuner/filter/TsRecordEvent"); - jmethodID eventInit = env->GetMethodID(eventClazz, "", "(IIIJJ)V"); + jmethodID eventInit = env->GetMethodID(eventClazz, "", "(IIIJJI)V"); for (int i = 0; i < events.size(); i++) { auto event = events[i]; @@ -614,7 +614,7 @@ jobjectArray FilterClientCallbackImpl::getMmtpRecordEvent( const std::vector& eventsExt) { JNIEnv *env = AndroidRuntime::getJNIEnv(); jclass eventClazz = env->FindClass("android/media/tv/tuner/filter/MmtpRecordEvent"); - jmethodID eventInit = env->GetMethodID(eventClazz, "", "(IJIJ)V"); + jmethodID eventInit = env->GetMethodID(eventClazz, "", "(IJIJII)V"); for (int i = 0; i < events.size(); i++) { auto event = events[i];