From d7a9ce9874201007172a719d0117db681728308d Mon Sep 17 00:00:00 2001
From: Amy Zhang <amyjojo@google.com>
Date: Fri, 18 Sep 2020 14:15:38 -0700
Subject: [PATCH] Add DTMB Frontend Status Support in Tuner JNI

Test: make -j44 dist
Bug: 159064654
Change-Id: I93d71b3eca30d7cd12fa2f459c9a5fce18549782
---
 media/jni/android_media_tv_Tuner.cpp | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/media/jni/android_media_tv_Tuner.cpp b/media/jni/android_media_tv_Tuner.cpp
index cd2fa636c0f69..9b86b529af478 100644
--- a/media/jni/android_media_tv_Tuner.cpp
+++ b/media/jni/android_media_tv_Tuner.cpp
@@ -2199,6 +2199,12 @@ jobject JTuner::getFrontendStatus(jintArray types) {
                             valid = true;
                             break;
                         }
+                        case FrontendModulation::hidl_discriminator::dtmb: {
+                            m[0] = static_cast<jint>(modulation.dtmb());
+                            env->SetIntArrayRegion(valObj, i, 1, m);
+                            valid = true;
+                            break;
+                        }
                         default:
                             break;
                     }
@@ -2247,6 +2253,10 @@ jobject JTuner::getFrontendStatus(jintArray types) {
                         intBandwidth = static_cast<jint>(bandwidth.isdbt());
                         break;
                     }
+                    case FrontendBandwidth::hidl_discriminator::dtmb: {
+                        intBandwidth = static_cast<jint>(bandwidth.dtmb());
+                        break;
+                    }
                     default:
                         valid = false;
                         break;
@@ -2271,6 +2281,10 @@ jobject JTuner::getFrontendStatus(jintArray types) {
                         intInterval = static_cast<jint>(interval.isdbt());
                         break;
                     }
+                    case FrontendGuardInterval::hidl_discriminator::dtmb: {
+                        intInterval = static_cast<jint>(interval.dtmb());
+                        break;
+                    }
                     default:
                         valid = false;
                         break;
@@ -2295,6 +2309,10 @@ jobject JTuner::getFrontendStatus(jintArray types) {
                         intTransmissionMode = static_cast<jint>(transmissionMode.isdbt());
                         break;
                     }
+                    case FrontendTransmissionMode::hidl_discriminator::dtmb: {
+                        intTransmissionMode = static_cast<jint>(transmissionMode.dtmb());
+                        break;
+                    }
                     default:
                         valid = false;
                         break;