Fix broken build

This reverts

c9889d1 Update aosp build to use a snapshot of exoplyer. by nchalko · 5
hours ago master
8952aa7 Clean format by nchalko · 20 hours ago
ba3fb16 Merge "Use a snapshot of exoplayer" by TreeHugger Robot · 18
hours ago
ff75e39 Project import generated by Copybara. by Live Channels Team · 22
hours ago
9737fc2 Use a snapshot of exoplayer by Nick Chalko · 20 hours ago
4a5144a Project import generated by Copybara. by Live Channels Team · 6
days ago

Bug: 72092981
Bug: 69474774
Change-Id: Ie756857c10bf052c60b6442c3d61252f65b49143

4 files changed, 7 insertions, 21 deletions

diff --git a/jni/DvbManager.cpp b/jni/DvbManager.cpp
index e55d07c5..b344f803 100644
--- a/jni/DvbManager.cpp
+++ b/jni/DvbManager.cpp
@@ -39,12 +39,14 @@ static double currentTimeMillis() {
 
 DvbManager::DvbManager(JNIEnv *env, jobject)
         : mFeFd(-1),
+          mDemuxFd(-1),
           mDvrFd(-1),
           mPatFilterFd(-1),
           mDvbApiVersion(DVB_API_VERSION_UNDEFINED),
           mDeliverySystemType(-1),
           mFeHasLock(false),
           mHasPendingTune(false) {
+    (void) mDemuxFd; // suppress unused warning
     jclass clazz = env->FindClass(
         "com/android/tv/tuner/TunerHal");
     mOpenDvbFrontEndMethodID = env->GetMethodID(
@@ -116,13 +118,11 @@ int DvbManager::tune(JNIEnv *env, jobject thiz,
 
     if (mDvbApiVersion == DVB_API_VERSION5) {
         struct dtv_property deliverySystemProperty = {
-            .cmd = DTV_DELIVERY_SYSTEM
+            .cmd = DTV_DELIVERY_SYSTEM, .u.data = SYS_ATSC
         };
-        deliverySystemProperty.u.data = SYS_ATSC;
         struct dtv_property frequencyProperty = {
-            .cmd = DTV_FREQUENCY
+            .cmd = DTV_FREQUENCY, .u.data = static_cast<__u32>(frequency)
         };
-        frequencyProperty.u.data = static_cast<__u32>(frequency);
         struct dtv_property modulationProperty = { .cmd = DTV_MODULATION };
         if (strncmp(modulationStr, "QAM", 3) == 0) {
             modulationProperty.u.data = QAM_AUTO;
@@ -503,4 +503,4 @@ int DvbManager::getDeliverySystemType(JNIEnv *env, jobject thiz) {
         }
     }
     return mDeliverySystemType;
-}
\ No newline at end of file
+}
diff --git a/jni/DvbManager.h b/jni/DvbManager.h
index 6289d645..2252332c 100644
--- a/jni/DvbManager.h
+++ b/jni/DvbManager.h
@@ -61,6 +61,7 @@ class DvbManager {
 
 
     int mFeFd;
+    int mDemuxFd;
     int mDvrFd;
     int mPatFilterFd;
     int mDvbApiVersion;
diff --git a/jni/gen_jni.sh b/jni/gen_jni.sh
index 2c246189..aa52b248 100755
--- a/jni/gen_jni.sh
+++ b/jni/gen_jni.sh
@@ -1,18 +1,3 @@
 #!/bin/bash
-#
-# Copyright (C) 2017 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
 
 javah -jni -classpath ../../bin/classes:../../../../../../prebuilts/sdk/current/android.jar -o tunertvinput_jni.h com.android.tv.tuner.TunerHal
diff --git a/jni/tunertvinput_jni.cpp b/jni/tunertvinput_jni.cpp
index 40091779..9ad15141 100644
--- a/jni/tunertvinput_jni.cpp
+++ b/jni/tunertvinput_jni.cpp
@@ -172,4 +172,4 @@ Java_com_android_tv_tuner_TunerHal_nativeGetDeliverySystemType
         sDvbManagers.insert(std::pair<jlong, DvbManager *>(deviceId, dvbManager));
         return dvbManager->getDeliverySystemType(env, thiz);
     }
-}
\ No newline at end of file
+}