summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Amy Zhang <amyjojo@google.com> 2021-02-25 10:44:11 -0800
committer Amy Zhang <amyjojo@google.com> 2021-02-25 20:04:55 +0000
commit952c2a99de929bc873752005dd2bd49078b3574d (patch)
tree7b7d50f07a862a71f4de56df5dfb5374a6c3793c
parent272c776dbbc277dc82ca704dd7ac36de0a55fc28 (diff)
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
-rw-r--r--media/jni/android_media_tv_Tuner.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/media/jni/android_media_tv_Tuner.cpp b/media/jni/android_media_tv_Tuner.cpp
index 4ae68762c08e..b7cde57beaf5 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<DemuxFilterEventExt::Event>& eventsExt) {
JNIEnv *env = AndroidRuntime::getJNIEnv();
jclass eventClazz = env->FindClass("android/media/tv/tuner/filter/TsRecordEvent");
- jmethodID eventInit = env->GetMethodID(eventClazz, "<init>", "(IIIJJ)V");
+ jmethodID eventInit = env->GetMethodID(eventClazz, "<init>", "(IIIJJI)V");
for (int i = 0; i < events.size(); i++) {
auto event = events[i];
@@ -614,7 +614,7 @@ jobjectArray FilterClientCallbackImpl::getMmtpRecordEvent(
const std::vector<DemuxFilterEventExt::Event>& eventsExt) {
JNIEnv *env = AndroidRuntime::getJNIEnv();
jclass eventClazz = env->FindClass("android/media/tv/tuner/filter/MmtpRecordEvent");
- jmethodID eventInit = env->GetMethodID(eventClazz, "<init>", "(IJIJ)V");
+ jmethodID eventInit = env->GetMethodID(eventClazz, "<init>", "(IJIJII)V");
for (int i = 0; i < events.size(); i++) {
auto event = events[i];