diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-12-30 12:23:49 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-30 12:23:49 +0000 |
| commit | 40d6bb1feb96d6276a4bd4a3879d10745b24d3c7 (patch) | |
| tree | b0a278ff7650259d322b788af02bfef957ac6bc4 | |
| parent | 4a1148442a093691982f6f86b2939cbcbd3c46e1 (diff) | |
| parent | b7172b5bc485fac79a7bc65ad3dc7175d8420b58 (diff) | |
Merge "Fix typo to get correct innerFec and Annex for cable signal" am: 6d1582be99 am: b7172b5bc4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1536132
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1ce3efa08977e5dbe6462c3fa0b6b26e32c96769
| -rw-r--r-- | media/jni/android_media_tv_Tuner.cpp | 4 |
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 04f50114a1e5..f031115de5d1 100644 --- a/media/jni/android_media_tv_Tuner.cpp +++ b/media/jni/android_media_tv_Tuner.cpp @@ -2060,7 +2060,7 @@ static FrontendSettings getDvbcFrontendSettings(JNIEnv *env, const jobject& sett env->GetIntField(settings, env->GetFieldID(clazz, "mModulation", "I"))); FrontendInnerFec innerFec = static_cast<FrontendInnerFec>( - env->GetLongField(settings, env->GetFieldID(clazz, "mFec", "J"))); + env->GetLongField(settings, env->GetFieldID(clazz, "mInnerFec", "J"))); uint32_t symbolRate = static_cast<uint32_t>( env->GetIntField(settings, env->GetFieldID(clazz, "mSymbolRate", "I"))); @@ -2069,7 +2069,7 @@ static FrontendSettings getDvbcFrontendSettings(JNIEnv *env, const jobject& sett env->GetIntField(settings, env->GetFieldID(clazz, "mOuterFec", "I"))); FrontendDvbcAnnex annex = static_cast<FrontendDvbcAnnex>( - env->GetByteField(settings, env->GetFieldID(clazz, "mAnnex", "B"))); + env->GetIntField(settings, env->GetFieldID(clazz, "mAnnex", "I"))); FrontendDvbcSpectralInversion spectralInversion = static_cast<FrontendDvbcSpectralInversion>( env->GetIntField( |