From 9651b006acd8f3368a6270323add582049c0e085 Mon Sep 17 00:00:00 2001
From: Henry Fang <quxiangfang@google.com>
Date: Thu, 20 Aug 2020 14:01:10 -0700
Subject: [PATCH] Fix typo to get correct innerFec and Annex for cable signal

bug: 165808730
Test: manual
Change-Id: I9213246c87512480cb08ab10b102b26f9fd9f681
Merged-In: I9213246c87512480cb08ab10b102b26f9fd9f681
---
 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 515d610109abb..2e8639cd1743a 100644
--- a/media/jni/android_media_tv_Tuner.cpp
+++ b/media/jni/android_media_tv_Tuner.cpp
@@ -2048,7 +2048,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")));
@@ -2057,7 +2057,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(