From 1ada6e814a9770882aa714f7c0e0fdbf1e9cb8bd Mon Sep 17 00:00:00 2001
From: Hongguang <hgchen@google.com>
Date: Thu, 17 Feb 2022 15:00:27 -0800
Subject: [PATCH] Fix DvrClient data type

Bug: 220039290
Test: atest android.media.tv.tuner.cts
Change-Id: Iaa3aaca3e92498147c72956957701f7bf902f405
Merged-In: Iaa3aaca3e92498147c72956957701f7bf902f405
(cherry picked from commit 6beccb2b4cc5a85564034264dc396aa16cf2c7cc)
---
 media/jni/android_media_tv_Tuner.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/media/jni/android_media_tv_Tuner.cpp b/media/jni/android_media_tv_Tuner.cpp
index 9ed1ac0fa360f..d0acc53f1fe70 100644
--- a/media/jni/android_media_tv_Tuner.cpp
+++ b/media/jni/android_media_tv_Tuner.cpp
@@ -4592,7 +4592,8 @@ static jlong android_media_tv_Tuner_read_dvr_from_array(
         ALOGD("Failed to GetByteArrayElements");
         return -1;
     }
-    long realSize = dvrClient->readFromBuffer(reinterpret_cast<signed char *>(src) + offset, size);
+    int64_t realSize =
+            dvrClient->readFromBuffer(reinterpret_cast<signed char *>(src) + offset, size);
     env->ReleaseByteArrayElements(buffer, src, 0);
     return (jlong)realSize;
 }
@@ -4624,7 +4625,8 @@ static jlong android_media_tv_Tuner_write_dvr_to_array(
         return -1;
     }
 
-    long realSize = dvrClient->writeToBuffer(reinterpret_cast<signed char *>(dst) + offset, size);
+    int64_t realSize =
+            dvrClient->writeToBuffer(reinterpret_cast<signed char *>(dst) + offset, size);
     env->ReleaseByteArrayElements(buffer, dst, 0);
     return (jlong)realSize;
 }