diff --git a/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/AudioExtraMetaData.aidl b/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/AudioExtraMetaData.aidl
index 20c6e5f..9db9609 100644
--- a/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/AudioExtraMetaData.aidl
+++ b/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/AudioExtraMetaData.aidl
@@ -37,7 +37,7 @@
 parcelable AudioExtraMetaData {
   byte adFade;
   byte adPan;
-  byte versionTextTag;
+  char versionTextTag;
   byte adGainCenter;
   byte adGainFront;
   byte adGainSurround;
diff --git a/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/DemuxAlpFilterSettings.aidl b/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/DemuxAlpFilterSettings.aidl
index ee8db8f..91a04a4 100644
--- a/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/DemuxAlpFilterSettings.aidl
+++ b/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/DemuxAlpFilterSettings.aidl
@@ -35,7 +35,7 @@
 /* @hide */
 @VintfStability
 parcelable DemuxAlpFilterSettings {
-  byte packetType;
+  int packetType;
   android.hardware.tv.tuner.DemuxAlpLengthType lengthType = android.hardware.tv.tuner.DemuxAlpLengthType.UNDEFINED;
   android.hardware.tv.tuner.DemuxAlpFilterSettingsFilterSettings filterSettings;
 }
diff --git a/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/DemuxCapabilities.aidl b/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/DemuxCapabilities.aidl
index 729b797..49afb94 100644
--- a/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/DemuxCapabilities.aidl
+++ b/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/DemuxCapabilities.aidl
@@ -44,7 +44,7 @@
   int numVideoFilter;
   int numPesFilter;
   int numPcrFilter;
-  int numBytesInSectionFilter;
+  long numBytesInSectionFilter;
   int filterCaps;
   int[] linkCaps;
   boolean bTimeFilter;
diff --git a/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/DemuxFilterDownloadEvent.aidl b/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/DemuxFilterDownloadEvent.aidl
index a9e7b7c..b51e633 100644
--- a/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/DemuxFilterDownloadEvent.aidl
+++ b/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/DemuxFilterDownloadEvent.aidl
@@ -39,5 +39,5 @@
   int mpuSequenceNumber;
   int itemFragmentIndex;
   int lastItemFragmentIndex;
-  char dataLength;
+  int dataLength;
 }
diff --git a/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/DemuxFilterIpPayloadEvent.aidl b/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/DemuxFilterIpPayloadEvent.aidl
index 0d20f8e..9134df3 100644
--- a/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/DemuxFilterIpPayloadEvent.aidl
+++ b/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/DemuxFilterIpPayloadEvent.aidl
@@ -35,5 +35,5 @@
 /* @hide */
 @VintfStability
 parcelable DemuxFilterIpPayloadEvent {
-  char dataLength;
+  int dataLength;
 }
diff --git a/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/DemuxFilterMediaEvent.aidl b/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/DemuxFilterMediaEvent.aidl
index 351a340..a463d68 100644
--- a/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/DemuxFilterMediaEvent.aidl
+++ b/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/DemuxFilterMediaEvent.aidl
@@ -35,11 +35,11 @@
 /* @hide */
 @VintfStability
 parcelable DemuxFilterMediaEvent {
-  char streamId;
+  int streamId;
   boolean isPtsPresent;
   long pts;
-  int dataLength;
-  int offset;
+  long dataLength;
+  long offset;
   android.hardware.common.NativeHandle avMemory;
   boolean isSecureMemory;
   long avDataId;
diff --git a/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/DemuxFilterPesDataSettings.aidl b/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/DemuxFilterPesDataSettings.aidl
index ac7f8a5..2420142 100644
--- a/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/DemuxFilterPesDataSettings.aidl
+++ b/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/DemuxFilterPesDataSettings.aidl
@@ -35,6 +35,6 @@
 /* @hide */
 @VintfStability
 parcelable DemuxFilterPesDataSettings {
-  char streamId;
+  int streamId;
   boolean isRaw;
 }
diff --git a/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/DemuxFilterPesEvent.aidl b/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/DemuxFilterPesEvent.aidl
index a4593b4..3ddd5e0 100644
--- a/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/DemuxFilterPesEvent.aidl
+++ b/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/DemuxFilterPesEvent.aidl
@@ -35,7 +35,7 @@
 /* @hide */
 @VintfStability
 parcelable DemuxFilterPesEvent {
-  char streamId;
-  char dataLength;
+  int streamId;
+  int dataLength;
   int mpuSequenceNumber;
 }
diff --git a/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/DemuxFilterSectionEvent.aidl b/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/DemuxFilterSectionEvent.aidl
index 114d1eb..01b8a77 100644
--- a/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/DemuxFilterSectionEvent.aidl
+++ b/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/DemuxFilterSectionEvent.aidl
@@ -35,8 +35,8 @@
 /* @hide */
 @VintfStability
 parcelable DemuxFilterSectionEvent {
-  char tableId;
-  char version;
-  char sectionNum;
-  char dataLength;
+  int tableId;
+  int version;
+  int sectionNum;
+  int dataLength;
 }
diff --git a/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/DemuxFilterSectionSettingsConditionTableInfo.aidl b/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/DemuxFilterSectionSettingsConditionTableInfo.aidl
index be25137..82d30cb 100644
--- a/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/DemuxFilterSectionSettingsConditionTableInfo.aidl
+++ b/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/DemuxFilterSectionSettingsConditionTableInfo.aidl
@@ -35,6 +35,6 @@
 /* @hide */
 @VintfStability
 parcelable DemuxFilterSectionSettingsConditionTableInfo {
-  char tableId;
-  char version;
+  int tableId;
+  int version;
 }
diff --git a/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/DemuxIpAddress.aidl b/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/DemuxIpAddress.aidl
index 935476a..a044a19 100644
--- a/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/DemuxIpAddress.aidl
+++ b/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/DemuxIpAddress.aidl
@@ -37,6 +37,6 @@
 parcelable DemuxIpAddress {
   android.hardware.tv.tuner.DemuxIpAddressIpAddress srcIpAddress;
   android.hardware.tv.tuner.DemuxIpAddressIpAddress dstIpAddress;
-  char srcPort;
-  char dstPort;
+  int srcPort;
+  int dstPort;
 }
diff --git a/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/DemuxMmtpFilterSettings.aidl b/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/DemuxMmtpFilterSettings.aidl
index b0fad65..b22c564 100644
--- a/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/DemuxMmtpFilterSettings.aidl
+++ b/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/DemuxMmtpFilterSettings.aidl
@@ -35,6 +35,6 @@
 /* @hide */
 @VintfStability
 parcelable DemuxMmtpFilterSettings {
-  char mmtpPid;
+  int mmtpPid;
   android.hardware.tv.tuner.DemuxMmtpFilterSettingsFilterSettings filterSettings;
 }
diff --git a/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/DemuxPid.aidl b/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/DemuxPid.aidl
index 0a29f93..c452f35 100644
--- a/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/DemuxPid.aidl
+++ b/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/DemuxPid.aidl
@@ -35,6 +35,6 @@
 /* @hide */
 @VintfStability
 union DemuxPid {
-  char tPid;
-  char mmtpPid;
+  int tPid;
+  int mmtpPid;
 }
diff --git a/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/DemuxTlvFilterSettings.aidl b/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/DemuxTlvFilterSettings.aidl
index dd94980..ddb61ce 100644
--- a/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/DemuxTlvFilterSettings.aidl
+++ b/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/DemuxTlvFilterSettings.aidl
@@ -35,7 +35,7 @@
 /* @hide */
 @VintfStability
 parcelable DemuxTlvFilterSettings {
-  byte packetType;
+  int packetType;
   boolean isCompressedIpPacket;
   android.hardware.tv.tuner.DemuxTlvFilterSettingsFilterSettings filterSettings;
 }
diff --git a/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/DemuxTsFilterSettings.aidl b/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/DemuxTsFilterSettings.aidl
index 131cab0..d8d424f 100644
--- a/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/DemuxTsFilterSettings.aidl
+++ b/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/DemuxTsFilterSettings.aidl
@@ -35,6 +35,6 @@
 /* @hide */
 @VintfStability
 parcelable DemuxTsFilterSettings {
-  char tpid;
+  int tpid;
   android.hardware.tv.tuner.DemuxTsFilterSettingsFilterSettings filterSettings;
 }
diff --git a/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/FrontendAnalogSettings.aidl b/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/FrontendAnalogSettings.aidl
index efb91ca..33e9347 100644
--- a/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/FrontendAnalogSettings.aidl
+++ b/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/FrontendAnalogSettings.aidl
@@ -35,8 +35,8 @@
 /* @hide */
 @VintfStability
 parcelable FrontendAnalogSettings {
-  int frequency;
-  int endFrequency;
+  long frequency;
+  long endFrequency;
   android.hardware.tv.tuner.FrontendSpectralInversion inversion = android.hardware.tv.tuner.FrontendSpectralInversion.UNDEFINED;
   android.hardware.tv.tuner.FrontendAnalogType type = android.hardware.tv.tuner.FrontendAnalogType.UNDEFINED;
   android.hardware.tv.tuner.FrontendAnalogAftFlag aftFlag = android.hardware.tv.tuner.FrontendAnalogAftFlag.UNDEFINED;
diff --git a/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/FrontendAtsc3PlpSettings.aidl b/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/FrontendAtsc3PlpSettings.aidl
index b569c21..6301f96 100644
--- a/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/FrontendAtsc3PlpSettings.aidl
+++ b/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/FrontendAtsc3PlpSettings.aidl
@@ -35,7 +35,7 @@
 /* @hide */
 @VintfStability
 parcelable FrontendAtsc3PlpSettings {
-  byte plpId;
+  int plpId;
   android.hardware.tv.tuner.FrontendAtsc3Modulation modulation = android.hardware.tv.tuner.FrontendAtsc3Modulation.UNDEFINED;
   android.hardware.tv.tuner.FrontendAtsc3TimeInterleaveMode interleaveMode = android.hardware.tv.tuner.FrontendAtsc3TimeInterleaveMode.UNDEFINED;
   android.hardware.tv.tuner.FrontendAtsc3CodeRate codeRate = android.hardware.tv.tuner.FrontendAtsc3CodeRate.UNDEFINED;
diff --git a/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/FrontendAtsc3Settings.aidl b/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/FrontendAtsc3Settings.aidl
index bd96d14..3cbb0d0 100644
--- a/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/FrontendAtsc3Settings.aidl
+++ b/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/FrontendAtsc3Settings.aidl
@@ -35,8 +35,8 @@
 /* @hide */
 @VintfStability
 parcelable FrontendAtsc3Settings {
-  int frequency;
-  int endFrequency;
+  long frequency;
+  long endFrequency;
   android.hardware.tv.tuner.FrontendAtsc3Bandwidth bandwidth = android.hardware.tv.tuner.FrontendAtsc3Bandwidth.UNDEFINED;
   android.hardware.tv.tuner.FrontendSpectralInversion inversion = android.hardware.tv.tuner.FrontendSpectralInversion.UNDEFINED;
   android.hardware.tv.tuner.FrontendAtsc3DemodOutputFormat demodOutputFormat = android.hardware.tv.tuner.FrontendAtsc3DemodOutputFormat.UNDEFINED;
diff --git a/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/FrontendAtscSettings.aidl b/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/FrontendAtscSettings.aidl
index 5ccdb85..9121c12 100644
--- a/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/FrontendAtscSettings.aidl
+++ b/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/FrontendAtscSettings.aidl
@@ -35,8 +35,8 @@
 /* @hide */
 @VintfStability
 parcelable FrontendAtscSettings {
-  int frequency;
-  int endFrequency;
+  long frequency;
+  long endFrequency;
   android.hardware.tv.tuner.FrontendSpectralInversion inversion = android.hardware.tv.tuner.FrontendSpectralInversion.UNDEFINED;
   android.hardware.tv.tuner.FrontendAtscModulation modulation = android.hardware.tv.tuner.FrontendAtscModulation.UNDEFINED;
 }
diff --git a/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/FrontendDtmbSettings.aidl b/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/FrontendDtmbSettings.aidl
index 9a2e341..5f9b775 100644
--- a/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/FrontendDtmbSettings.aidl
+++ b/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/FrontendDtmbSettings.aidl
@@ -35,8 +35,8 @@
 /* @hide */
 @VintfStability
 parcelable FrontendDtmbSettings {
-  int frequency;
-  int endFrequency;
+  long frequency;
+  long endFrequency;
   android.hardware.tv.tuner.FrontendSpectralInversion inversion = android.hardware.tv.tuner.FrontendSpectralInversion.UNDEFINED;
   android.hardware.tv.tuner.FrontendDtmbTransmissionMode transmissionMode = android.hardware.tv.tuner.FrontendDtmbTransmissionMode.UNDEFINED;
   android.hardware.tv.tuner.FrontendDtmbBandwidth bandwidth = android.hardware.tv.tuner.FrontendDtmbBandwidth.UNDEFINED;
diff --git a/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/FrontendDvbcSettings.aidl b/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/FrontendDvbcSettings.aidl
index 55f0402..6b2caed 100644
--- a/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/FrontendDvbcSettings.aidl
+++ b/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/FrontendDvbcSettings.aidl
@@ -35,8 +35,8 @@
 /* @hide */
 @VintfStability
 parcelable FrontendDvbcSettings {
-  int frequency;
-  int endFrequency;
+  long frequency;
+  long endFrequency;
   android.hardware.tv.tuner.FrontendDvbcModulation modulation = android.hardware.tv.tuner.FrontendDvbcModulation.UNDEFINED;
   android.hardware.tv.tuner.FrontendInnerFec fec = android.hardware.tv.tuner.FrontendInnerFec.FEC_UNDEFINED;
   int symbolRate;
diff --git a/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/FrontendDvbsSettings.aidl b/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/FrontendDvbsSettings.aidl
index 8a8c76f..dab8888 100644
--- a/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/FrontendDvbsSettings.aidl
+++ b/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/FrontendDvbsSettings.aidl
@@ -35,8 +35,8 @@
 /* @hide */
 @VintfStability
 parcelable FrontendDvbsSettings {
-  int frequency;
-  int endFrequency;
+  long frequency;
+  long endFrequency;
   android.hardware.tv.tuner.FrontendSpectralInversion inversion = android.hardware.tv.tuner.FrontendSpectralInversion.UNDEFINED;
   android.hardware.tv.tuner.FrontendDvbsModulation modulation = android.hardware.tv.tuner.FrontendDvbsModulation.UNDEFINED;
   android.hardware.tv.tuner.FrontendDvbsCodeRate coderate;
diff --git a/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/FrontendDvbtSettings.aidl b/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/FrontendDvbtSettings.aidl
index cc64549..ec1277a 100644
--- a/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/FrontendDvbtSettings.aidl
+++ b/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/FrontendDvbtSettings.aidl
@@ -35,8 +35,8 @@
 /* @hide */
 @VintfStability
 parcelable FrontendDvbtSettings {
-  int frequency;
-  int endFrequency;
+  long frequency;
+  long endFrequency;
   android.hardware.tv.tuner.FrontendSpectralInversion inversion = android.hardware.tv.tuner.FrontendSpectralInversion.UNDEFINED;
   android.hardware.tv.tuner.FrontendDvbtTransmissionMode transmissionMode = android.hardware.tv.tuner.FrontendDvbtTransmissionMode.UNDEFINED;
   android.hardware.tv.tuner.FrontendDvbtBandwidth bandwidth = android.hardware.tv.tuner.FrontendDvbtBandwidth.UNDEFINED;
@@ -49,6 +49,6 @@
   android.hardware.tv.tuner.FrontendDvbtStandard standard = android.hardware.tv.tuner.FrontendDvbtStandard.UNDEFINED;
   boolean isMiso;
   android.hardware.tv.tuner.FrontendDvbtPlpMode plpMode = android.hardware.tv.tuner.FrontendDvbtPlpMode.UNDEFINED;
-  byte plpId;
-  byte plpGroupId;
+  int plpId;
+  int plpGroupId;
 }
diff --git a/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/FrontendInfo.aidl b/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/FrontendInfo.aidl
index 2f8e6e5..d5bdd58 100644
--- a/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/FrontendInfo.aidl
+++ b/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/FrontendInfo.aidl
@@ -36,11 +36,11 @@
 @VintfStability
 parcelable FrontendInfo {
   android.hardware.tv.tuner.FrontendType type = android.hardware.tv.tuner.FrontendType.UNDEFINED;
-  int minFrequency;
-  int maxFrequency;
+  long minFrequency;
+  long maxFrequency;
   int minSymbolRate;
   int maxSymbolRate;
-  int acquireRange;
+  long acquireRange;
   int exclusiveGroupId;
   android.hardware.tv.tuner.FrontendStatusType[] statusCaps;
   android.hardware.tv.tuner.FrontendCapabilities frontendCaps;
diff --git a/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/FrontendIsdbs3Settings.aidl b/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/FrontendIsdbs3Settings.aidl
index b96bf32..8c491d6 100644
--- a/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/FrontendIsdbs3Settings.aidl
+++ b/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/FrontendIsdbs3Settings.aidl
@@ -35,9 +35,9 @@
 /* @hide */
 @VintfStability
 parcelable FrontendIsdbs3Settings {
-  int frequency;
-  int endFrequency;
-  char streamId;
+  long frequency;
+  long endFrequency;
+  int streamId;
   android.hardware.tv.tuner.FrontendIsdbsStreamIdType streamIdType = android.hardware.tv.tuner.FrontendIsdbsStreamIdType.UNDEFINED;
   android.hardware.tv.tuner.FrontendIsdbs3Modulation modulation = android.hardware.tv.tuner.FrontendIsdbs3Modulation.UNDEFINED;
   android.hardware.tv.tuner.FrontendIsdbs3Coderate coderate = android.hardware.tv.tuner.FrontendIsdbs3Coderate.UNDEFINED;
diff --git a/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/FrontendIsdbsSettings.aidl b/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/FrontendIsdbsSettings.aidl
index 0b48ac5..324fb6f 100644
--- a/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/FrontendIsdbsSettings.aidl
+++ b/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/FrontendIsdbsSettings.aidl
@@ -35,9 +35,9 @@
 /* @hide */
 @VintfStability
 parcelable FrontendIsdbsSettings {
-  int frequency;
-  int endFrequency;
-  char streamId;
+  long frequency;
+  long endFrequency;
+  int streamId;
   android.hardware.tv.tuner.FrontendIsdbsStreamIdType streamIdType = android.hardware.tv.tuner.FrontendIsdbsStreamIdType.UNDEFINED;
   android.hardware.tv.tuner.FrontendIsdbsModulation modulation = android.hardware.tv.tuner.FrontendIsdbsModulation.UNDEFINED;
   android.hardware.tv.tuner.FrontendIsdbsCoderate coderate = android.hardware.tv.tuner.FrontendIsdbsCoderate.UNDEFINED;
diff --git a/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/FrontendIsdbtSettings.aidl b/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/FrontendIsdbtSettings.aidl
index ffd30ef..6249097 100644
--- a/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/FrontendIsdbtSettings.aidl
+++ b/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/FrontendIsdbtSettings.aidl
@@ -35,8 +35,8 @@
 /* @hide */
 @VintfStability
 parcelable FrontendIsdbtSettings {
-  int frequency;
-  int endFrequency;
+  long frequency;
+  long endFrequency;
   android.hardware.tv.tuner.FrontendSpectralInversion inversion = android.hardware.tv.tuner.FrontendSpectralInversion.UNDEFINED;
   android.hardware.tv.tuner.FrontendIsdbtModulation modulation = android.hardware.tv.tuner.FrontendIsdbtModulation.UNDEFINED;
   android.hardware.tv.tuner.FrontendIsdbtBandwidth bandwidth = android.hardware.tv.tuner.FrontendIsdbtBandwidth.UNDEFINED;
diff --git a/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/FrontendScanAtsc3PlpInfo.aidl b/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/FrontendScanAtsc3PlpInfo.aidl
index 4e217ef..56ef3e3 100644
--- a/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/FrontendScanAtsc3PlpInfo.aidl
+++ b/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/FrontendScanAtsc3PlpInfo.aidl
@@ -35,6 +35,6 @@
 /* @hide */
 @VintfStability
 parcelable FrontendScanAtsc3PlpInfo {
-  byte plpId;
+  int plpId;
   boolean bLlsFlag;
 }
diff --git a/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/FrontendScanMessage.aidl b/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/FrontendScanMessage.aidl
index 882bdad..2c6cc00 100644
--- a/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/FrontendScanMessage.aidl
+++ b/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/FrontendScanMessage.aidl
@@ -37,14 +37,14 @@
 union FrontendScanMessage {
   boolean isLocked;
   boolean isEnd;
-  byte progressPercent;
-  int[] frequencies;
+  int progressPercent;
+  long[] frequencies;
   int[] symbolRates;
   android.hardware.tv.tuner.FrontendDvbtHierarchy hierarchy;
   android.hardware.tv.tuner.FrontendAnalogType analogType;
-  byte[] plpIds;
-  byte[] groupIds;
-  char[] inputStreamIds;
+  int[] plpIds;
+  int[] groupIds;
+  int[] inputStreamIds;
   android.hardware.tv.tuner.FrontendScanMessageStandard std;
   android.hardware.tv.tuner.FrontendScanAtsc3PlpInfo[] atsc3PlpInfos;
   android.hardware.tv.tuner.FrontendModulation modulation;
diff --git a/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/FrontendStatus.aidl b/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/FrontendStatus.aidl
index 114b72f..6296cfc 100644
--- a/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/FrontendStatus.aidl
+++ b/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/FrontendStatus.aidl
@@ -47,13 +47,13 @@
   android.hardware.tv.tuner.FrontendModulationStatus modulationStatus;
   android.hardware.tv.tuner.FrontendSpectralInversion inversion;
   android.hardware.tv.tuner.LnbVoltage lnbVoltage;
-  byte plpId;
+  int plpId;
   boolean isEWBS;
-  byte agc;
+  int agc;
   boolean isLnaOn;
   boolean[] isLayerError;
   int mer;
-  int freqOffset;
+  long freqOffset;
   android.hardware.tv.tuner.FrontendDvbtHierarchy hierarchy;
   boolean isRfLocked;
   android.hardware.tv.tuner.FrontendStatusAtsc3PlpInfo[] plpInfo;
@@ -64,9 +64,9 @@
   android.hardware.tv.tuner.FrontendGuardInterval interval;
   android.hardware.tv.tuner.FrontendTransmissionMode transmissionMode;
   int uec;
-  char systemId;
+  int systemId;
   android.hardware.tv.tuner.FrontendInterleaveMode[] interleaving;
-  byte[] isdbtSegment;
+  int[] isdbtSegment;
   int[] tsDataRate;
   android.hardware.tv.tuner.FrontendRollOff rollOff;
   boolean isMiso;
diff --git a/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/FrontendStatusAtsc3PlpInfo.aidl b/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/FrontendStatusAtsc3PlpInfo.aidl
index 9cd1b8a..8f65925 100644
--- a/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/FrontendStatusAtsc3PlpInfo.aidl
+++ b/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/FrontendStatusAtsc3PlpInfo.aidl
@@ -35,7 +35,7 @@
 /* @hide */
 @VintfStability
 parcelable FrontendStatusAtsc3PlpInfo {
-  byte plpId;
+  int plpId;
   boolean isLocked;
   int uec;
 }
diff --git a/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/PlaybackSettings.aidl b/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/PlaybackSettings.aidl
index ff459e2..e0dd5db 100644
--- a/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/PlaybackSettings.aidl
+++ b/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/PlaybackSettings.aidl
@@ -36,8 +36,8 @@
 @VintfStability
 parcelable PlaybackSettings {
   int statusMask;
-  int lowThreshold;
-  int highThreshold;
+  long lowThreshold;
+  long highThreshold;
   android.hardware.tv.tuner.DataFormat dataFormat = android.hardware.tv.tuner.DataFormat.UNDEFINED;
-  byte packetSize;
+  long packetSize;
 }
diff --git a/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/RecordSettings.aidl b/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/RecordSettings.aidl
index 447de98..de693cd 100644
--- a/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/RecordSettings.aidl
+++ b/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/RecordSettings.aidl
@@ -36,8 +36,8 @@
 @VintfStability
 parcelable RecordSettings {
   int statusMask;
-  int lowThreshold;
-  int highThreshold;
+  long lowThreshold;
+  long highThreshold;
   android.hardware.tv.tuner.DataFormat dataFormat = android.hardware.tv.tuner.DataFormat.UNDEFINED;
-  byte packetSize;
+  long packetSize;
 }
diff --git a/tv/tuner/aidl/android/hardware/tv/tuner/AudioExtraMetaData.aidl b/tv/tuner/aidl/android/hardware/tv/tuner/AudioExtraMetaData.aidl
index b5adb7d..ea2ef4f 100644
--- a/tv/tuner/aidl/android/hardware/tv/tuner/AudioExtraMetaData.aidl
+++ b/tv/tuner/aidl/android/hardware/tv/tuner/AudioExtraMetaData.aidl
@@ -27,7 +27,7 @@
 
     byte adPan;
 
-    byte versionTextTag;
+    char  versionTextTag;
 
     byte adGainCenter;
 
diff --git a/tv/tuner/aidl/android/hardware/tv/tuner/DemuxAlpFilterSettings.aidl b/tv/tuner/aidl/android/hardware/tv/tuner/DemuxAlpFilterSettings.aidl
index 397002d..95bcf65 100644
--- a/tv/tuner/aidl/android/hardware/tv/tuner/DemuxAlpFilterSettings.aidl
+++ b/tv/tuner/aidl/android/hardware/tv/tuner/DemuxAlpFilterSettings.aidl
@@ -33,7 +33,7 @@
      * 6: Packet Type Extension
      * 8: MPEG-2 Transport Stream
      */
-    byte packetType;
+    int packetType;
 
     DemuxAlpLengthType lengthType = DemuxAlpLengthType.UNDEFINED;
 
diff --git a/tv/tuner/aidl/android/hardware/tv/tuner/DemuxCapabilities.aidl b/tv/tuner/aidl/android/hardware/tv/tuner/DemuxCapabilities.aidl
index 49fa08d..6d61c97 100644
--- a/tv/tuner/aidl/android/hardware/tv/tuner/DemuxCapabilities.aidl
+++ b/tv/tuner/aidl/android/hardware/tv/tuner/DemuxCapabilities.aidl
@@ -70,7 +70,7 @@
     /**
      * The maximum number of bytes is supported in the mask of Section Filter.
      */
-    int numBytesInSectionFilter;
+    long numBytesInSectionFilter;
 
     /**
      * Filter Main Types defined by DemuxFilterMainType. The DemuxFilterMainTypes
diff --git a/tv/tuner/aidl/android/hardware/tv/tuner/DemuxFilterDownloadEvent.aidl b/tv/tuner/aidl/android/hardware/tv/tuner/DemuxFilterDownloadEvent.aidl
index d59dd2e..cf88928 100644
--- a/tv/tuner/aidl/android/hardware/tv/tuner/DemuxFilterDownloadEvent.aidl
+++ b/tv/tuner/aidl/android/hardware/tv/tuner/DemuxFilterDownloadEvent.aidl
@@ -39,5 +39,5 @@
     /**
      * Data size in bytes of filtered data
      */
-    char dataLength;
+    int dataLength;
 }
diff --git a/tv/tuner/aidl/android/hardware/tv/tuner/DemuxFilterIpPayloadEvent.aidl b/tv/tuner/aidl/android/hardware/tv/tuner/DemuxFilterIpPayloadEvent.aidl
index 0619b45..4d6c6e2 100644
--- a/tv/tuner/aidl/android/hardware/tv/tuner/DemuxFilterIpPayloadEvent.aidl
+++ b/tv/tuner/aidl/android/hardware/tv/tuner/DemuxFilterIpPayloadEvent.aidl
@@ -25,5 +25,5 @@
     /**
      * Data size in bytes of IP data
      */
-    char dataLength;
+    int dataLength;
 }
diff --git a/tv/tuner/aidl/android/hardware/tv/tuner/DemuxFilterMediaEvent.aidl b/tv/tuner/aidl/android/hardware/tv/tuner/DemuxFilterMediaEvent.aidl
index 754708c..ec7bbf1 100644
--- a/tv/tuner/aidl/android/hardware/tv/tuner/DemuxFilterMediaEvent.aidl
+++ b/tv/tuner/aidl/android/hardware/tv/tuner/DemuxFilterMediaEvent.aidl
@@ -26,7 +26,7 @@
  */
 @VintfStability
 parcelable DemuxFilterMediaEvent {
-    char streamId;
+    int streamId;
 
     /**
      * true if PTS is present in PES header.
@@ -42,13 +42,13 @@
     /**
      * Data size in bytes of audio or video frame
      */
-    int dataLength;
+    long dataLength;
 
     /**
      *  The offset in the memory block which is shared among multiple
      *  MediaEvents.
      */
-    int offset;
+    long offset;
 
     /**
      * A handle associated to the memory where audio or video data stays.
diff --git a/tv/tuner/aidl/android/hardware/tv/tuner/DemuxFilterPesDataSettings.aidl b/tv/tuner/aidl/android/hardware/tv/tuner/DemuxFilterPesDataSettings.aidl
index 9780f40..56fbbfc 100644
--- a/tv/tuner/aidl/android/hardware/tv/tuner/DemuxFilterPesDataSettings.aidl
+++ b/tv/tuner/aidl/android/hardware/tv/tuner/DemuxFilterPesDataSettings.aidl
@@ -22,7 +22,7 @@
  */
 @VintfStability
 parcelable DemuxFilterPesDataSettings {
-    char streamId;
+    int streamId;
 
     /**
      * true if the filter send onFilterStatus instead of onFilterEvent.
diff --git a/tv/tuner/aidl/android/hardware/tv/tuner/DemuxFilterPesEvent.aidl b/tv/tuner/aidl/android/hardware/tv/tuner/DemuxFilterPesEvent.aidl
index 2b24cd9..0767c02 100644
--- a/tv/tuner/aidl/android/hardware/tv/tuner/DemuxFilterPesEvent.aidl
+++ b/tv/tuner/aidl/android/hardware/tv/tuner/DemuxFilterPesEvent.aidl
@@ -22,12 +22,12 @@
  */
 @VintfStability
 parcelable DemuxFilterPesEvent {
-    char streamId;
+    int streamId;
 
     /**
      * Data size in bytes of PES data
      */
-    char dataLength;
+    int dataLength;
 
     /**
      * MPU sequence number of filtered data (only for MMTP)
diff --git a/tv/tuner/aidl/android/hardware/tv/tuner/DemuxFilterSectionEvent.aidl b/tv/tuner/aidl/android/hardware/tv/tuner/DemuxFilterSectionEvent.aidl
index 1a327f3..d666316 100644
--- a/tv/tuner/aidl/android/hardware/tv/tuner/DemuxFilterSectionEvent.aidl
+++ b/tv/tuner/aidl/android/hardware/tv/tuner/DemuxFilterSectionEvent.aidl
@@ -25,20 +25,20 @@
     /**
      * Table ID of filtered data
      */
-    char tableId;
+    int tableId;
 
     /**
      * Version number of filtered data
      */
-    char version;
+    int version;
 
     /**
      * Section number of filtered data
      */
-    char sectionNum;
+    int sectionNum;
 
     /**
      * Data size in bytes of filtered data
      */
-    char dataLength;
+    int dataLength;
 }
diff --git a/tv/tuner/aidl/android/hardware/tv/tuner/DemuxFilterSectionSettingsConditionTableInfo.aidl b/tv/tuner/aidl/android/hardware/tv/tuner/DemuxFilterSectionSettingsConditionTableInfo.aidl
index c76d84c..898b9cc 100644
--- a/tv/tuner/aidl/android/hardware/tv/tuner/DemuxFilterSectionSettingsConditionTableInfo.aidl
+++ b/tv/tuner/aidl/android/hardware/tv/tuner/DemuxFilterSectionSettingsConditionTableInfo.aidl
@@ -25,10 +25,10 @@
     /**
      * Table ID for Section Filter
      */
-    char tableId;
+    int tableId;
 
     /**
      * Version number for Section Filter
      */
-    char version;
+    int version;
 }
diff --git a/tv/tuner/aidl/android/hardware/tv/tuner/DemuxIpAddress.aidl b/tv/tuner/aidl/android/hardware/tv/tuner/DemuxIpAddress.aidl
index 9c704a3..c088cdc 100644
--- a/tv/tuner/aidl/android/hardware/tv/tuner/DemuxIpAddress.aidl
+++ b/tv/tuner/aidl/android/hardware/tv/tuner/DemuxIpAddress.aidl
@@ -31,10 +31,10 @@
     /**
      * 0 is invalid. should be ignored.
      */
-    char srcPort;
+    int srcPort;
 
     /**
      * 0 is invalid. should be ignored.
      */
-    char dstPort;
+    int dstPort;
 }
diff --git a/tv/tuner/aidl/android/hardware/tv/tuner/DemuxMmtpFilterSettings.aidl b/tv/tuner/aidl/android/hardware/tv/tuner/DemuxMmtpFilterSettings.aidl
index 3759ce0..8093d63 100644
--- a/tv/tuner/aidl/android/hardware/tv/tuner/DemuxMmtpFilterSettings.aidl
+++ b/tv/tuner/aidl/android/hardware/tv/tuner/DemuxMmtpFilterSettings.aidl
@@ -24,7 +24,7 @@
  */
 @VintfStability
 parcelable DemuxMmtpFilterSettings {
-    char mmtpPid;
+    int mmtpPid;
 
     DemuxMmtpFilterSettingsFilterSettings filterSettings;
 }
diff --git a/tv/tuner/aidl/android/hardware/tv/tuner/DemuxPid.aidl b/tv/tuner/aidl/android/hardware/tv/tuner/DemuxPid.aidl
index a76d208..7513454 100644
--- a/tv/tuner/aidl/android/hardware/tv/tuner/DemuxPid.aidl
+++ b/tv/tuner/aidl/android/hardware/tv/tuner/DemuxPid.aidl
@@ -25,10 +25,10 @@
     /**
      * Packet ID is used to specify packets in transport stream.
      */
-    char tPid;
+    int tPid;
 
     /**
      * Packet ID is used to specify packets in MMTP.
      */
-    char mmtpPid;
+    int mmtpPid;
 }
diff --git a/tv/tuner/aidl/android/hardware/tv/tuner/DemuxTlvFilterSettings.aidl b/tv/tuner/aidl/android/hardware/tv/tuner/DemuxTlvFilterSettings.aidl
index fd1289d..7a215e7 100644
--- a/tv/tuner/aidl/android/hardware/tv/tuner/DemuxTlvFilterSettings.aidl
+++ b/tv/tuner/aidl/android/hardware/tv/tuner/DemuxTlvFilterSettings.aidl
@@ -32,7 +32,7 @@
      * 0xFE: Signaling packet
      * 0xFF: NULL packet
      */
-    byte packetType;
+    int packetType;
 
     /**
      * true if the filtered data is commpressed ip packet
diff --git a/tv/tuner/aidl/android/hardware/tv/tuner/DemuxTsFilterSettings.aidl b/tv/tuner/aidl/android/hardware/tv/tuner/DemuxTsFilterSettings.aidl
index 1345831..0fc40d6 100644
--- a/tv/tuner/aidl/android/hardware/tv/tuner/DemuxTsFilterSettings.aidl
+++ b/tv/tuner/aidl/android/hardware/tv/tuner/DemuxTsFilterSettings.aidl
@@ -27,7 +27,7 @@
     /**
      * Packet ID is used to specify packets in transport stream.
      */
-    char tpid;
+    int tpid;
 
     DemuxTsFilterSettingsFilterSettings filterSettings;
 }
diff --git a/tv/tuner/aidl/android/hardware/tv/tuner/FrontendAnalogSettings.aidl b/tv/tuner/aidl/android/hardware/tv/tuner/FrontendAnalogSettings.aidl
index 926929f..0a3646d 100644
--- a/tv/tuner/aidl/android/hardware/tv/tuner/FrontendAnalogSettings.aidl
+++ b/tv/tuner/aidl/android/hardware/tv/tuner/FrontendAnalogSettings.aidl
@@ -30,12 +30,12 @@
     /**
      * Signal frequency in Hertz
      */
-    int frequency;
+    long frequency;
 
     /**
      * Signal end frequency in Hertz used by scan
      */
-    int endFrequency;
+    long endFrequency;
 
     FrontendSpectralInversion inversion = FrontendSpectralInversion.UNDEFINED;
 
diff --git a/tv/tuner/aidl/android/hardware/tv/tuner/FrontendAtsc3PlpSettings.aidl b/tv/tuner/aidl/android/hardware/tv/tuner/FrontendAtsc3PlpSettings.aidl
index 5678dd3..b7e2295 100644
--- a/tv/tuner/aidl/android/hardware/tv/tuner/FrontendAtsc3PlpSettings.aidl
+++ b/tv/tuner/aidl/android/hardware/tv/tuner/FrontendAtsc3PlpSettings.aidl
@@ -27,7 +27,7 @@
  */
 @VintfStability
 parcelable FrontendAtsc3PlpSettings {
-    byte plpId;
+    int plpId;
 
     FrontendAtsc3Modulation modulation = FrontendAtsc3Modulation.UNDEFINED;
 
diff --git a/tv/tuner/aidl/android/hardware/tv/tuner/FrontendAtsc3Settings.aidl b/tv/tuner/aidl/android/hardware/tv/tuner/FrontendAtsc3Settings.aidl
index dc1e520..981adc5 100644
--- a/tv/tuner/aidl/android/hardware/tv/tuner/FrontendAtsc3Settings.aidl
+++ b/tv/tuner/aidl/android/hardware/tv/tuner/FrontendAtsc3Settings.aidl
@@ -30,12 +30,12 @@
     /**
      * Signal frequency in Hertz
      */
-    int frequency;
+    long frequency;
 
     /**
      * Signal end frequency in Hertz used by scan
      */
-    int endFrequency;
+    long endFrequency;
 
     /**
      * Bandwidth of tuning band.
diff --git a/tv/tuner/aidl/android/hardware/tv/tuner/FrontendAtscSettings.aidl b/tv/tuner/aidl/android/hardware/tv/tuner/FrontendAtscSettings.aidl
index 1279b14..f9d267e 100644
--- a/tv/tuner/aidl/android/hardware/tv/tuner/FrontendAtscSettings.aidl
+++ b/tv/tuner/aidl/android/hardware/tv/tuner/FrontendAtscSettings.aidl
@@ -28,12 +28,12 @@
     /**
      * Signal frequency in Hertz
      */
-    int frequency;
+    long frequency;
 
     /**
      * Signal end frequency in Hertz used by scan
      */
-    int endFrequency;
+    long endFrequency;
 
     FrontendSpectralInversion inversion = FrontendSpectralInversion.UNDEFINED;
 
diff --git a/tv/tuner/aidl/android/hardware/tv/tuner/FrontendDtmbSettings.aidl b/tv/tuner/aidl/android/hardware/tv/tuner/FrontendDtmbSettings.aidl
index ccac650..095d0b5 100644
--- a/tv/tuner/aidl/android/hardware/tv/tuner/FrontendDtmbSettings.aidl
+++ b/tv/tuner/aidl/android/hardware/tv/tuner/FrontendDtmbSettings.aidl
@@ -33,12 +33,12 @@
     /**
      * Signal frequency in Hertz
      */
-    int frequency;
+    long frequency;
 
     /**
      * Signal end frequency in Hertz used by scan
      */
-    int endFrequency;
+    long endFrequency;
 
     FrontendSpectralInversion inversion = FrontendSpectralInversion.UNDEFINED;
 
diff --git a/tv/tuner/aidl/android/hardware/tv/tuner/FrontendDvbcSettings.aidl b/tv/tuner/aidl/android/hardware/tv/tuner/FrontendDvbcSettings.aidl
index d18d373..51be57f 100644
--- a/tv/tuner/aidl/android/hardware/tv/tuner/FrontendDvbcSettings.aidl
+++ b/tv/tuner/aidl/android/hardware/tv/tuner/FrontendDvbcSettings.aidl
@@ -33,12 +33,12 @@
     /**
      * Signal frequency in Hertz
      */
-    int frequency;
+    long frequency;
 
     /**
      * Signal end frequency in Hertz used by scan
      */
-    int endFrequency;
+    long endFrequency;
 
     FrontendDvbcModulation modulation = FrontendDvbcModulation.UNDEFINED;
 
diff --git a/tv/tuner/aidl/android/hardware/tv/tuner/FrontendDvbsSettings.aidl b/tv/tuner/aidl/android/hardware/tv/tuner/FrontendDvbsSettings.aidl
index d285ac1..785046b 100644
--- a/tv/tuner/aidl/android/hardware/tv/tuner/FrontendDvbsSettings.aidl
+++ b/tv/tuner/aidl/android/hardware/tv/tuner/FrontendDvbsSettings.aidl
@@ -34,12 +34,12 @@
     /**
      * Signal frequency in Hertz
      */
-    int frequency;
+    long frequency;
 
     /**
      * Signal end frequency in Hertz used by scan
      */
-    int endFrequency;
+    long endFrequency;
 
     FrontendSpectralInversion inversion = FrontendSpectralInversion.UNDEFINED;
 
diff --git a/tv/tuner/aidl/android/hardware/tv/tuner/FrontendDvbtSettings.aidl b/tv/tuner/aidl/android/hardware/tv/tuner/FrontendDvbtSettings.aidl
index 4af0d10..238f071 100644
--- a/tv/tuner/aidl/android/hardware/tv/tuner/FrontendDvbtSettings.aidl
+++ b/tv/tuner/aidl/android/hardware/tv/tuner/FrontendDvbtSettings.aidl
@@ -35,12 +35,12 @@
     /**
      * Signal frequency in Hertz
      */
-    int frequency;
+    long frequency;
 
     /**
      * Signal end frequency in Hertz used by scan
      */
-    int endFrequency;
+    long endFrequency;
 
     FrontendSpectralInversion inversion = FrontendSpectralInversion.UNDEFINED;
 
@@ -75,10 +75,10 @@
     /**
      * Physical Layer Pipe (PLP) Id
      */
-    byte plpId;
+    int plpId;
 
     /**
      * Group Id for Physical Layer Pipe (PLP)
      */
-    byte plpGroupId;
+    int plpGroupId;
 }
diff --git a/tv/tuner/aidl/android/hardware/tv/tuner/FrontendInfo.aidl b/tv/tuner/aidl/android/hardware/tv/tuner/FrontendInfo.aidl
index 9f178db..6168fc1 100644
--- a/tv/tuner/aidl/android/hardware/tv/tuner/FrontendInfo.aidl
+++ b/tv/tuner/aidl/android/hardware/tv/tuner/FrontendInfo.aidl
@@ -31,12 +31,12 @@
     /**
      * Frequency in Hertz
      */
-    int minFrequency;
+    long minFrequency;
 
     /**
      * Frequency in Hertz
      */
-    int maxFrequency;
+    long maxFrequency;
 
     /**
      * Minimum symbols per second
@@ -51,7 +51,7 @@
     /**
      * Range in Hertz
      */
-    int acquireRange;
+    long acquireRange;
 
     /**
      * Frontends are assigned with the same exclusiveGroupId if they can't
diff --git a/tv/tuner/aidl/android/hardware/tv/tuner/FrontendIsdbs3Settings.aidl b/tv/tuner/aidl/android/hardware/tv/tuner/FrontendIsdbs3Settings.aidl
index a7c85ac..9b38a59 100644
--- a/tv/tuner/aidl/android/hardware/tv/tuner/FrontendIsdbs3Settings.aidl
+++ b/tv/tuner/aidl/android/hardware/tv/tuner/FrontendIsdbs3Settings.aidl
@@ -30,14 +30,14 @@
     /**
      * Signal frequency in Hertz
      */
-    int frequency;
+    long frequency;
 
     /**
      * Signal end frequency in Hertz used by scan
      */
-    int endFrequency;
+    long endFrequency;
 
-    char streamId;
+    int streamId;
 
     FrontendIsdbsStreamIdType streamIdType = FrontendIsdbsStreamIdType.UNDEFINED;
 
diff --git a/tv/tuner/aidl/android/hardware/tv/tuner/FrontendIsdbsSettings.aidl b/tv/tuner/aidl/android/hardware/tv/tuner/FrontendIsdbsSettings.aidl
index dde3002..d5b90b7 100644
--- a/tv/tuner/aidl/android/hardware/tv/tuner/FrontendIsdbsSettings.aidl
+++ b/tv/tuner/aidl/android/hardware/tv/tuner/FrontendIsdbsSettings.aidl
@@ -30,14 +30,14 @@
     /**
      * Signal frequency in Hertz
      */
-    int frequency;
+    long frequency;
 
     /**
      * Signal end frequency in Hertz used by scan
      */
-    int endFrequency;
+    long endFrequency;
 
-    char streamId;
+    int streamId;
 
     FrontendIsdbsStreamIdType streamIdType = FrontendIsdbsStreamIdType.UNDEFINED;
 
diff --git a/tv/tuner/aidl/android/hardware/tv/tuner/FrontendIsdbtSettings.aidl b/tv/tuner/aidl/android/hardware/tv/tuner/FrontendIsdbtSettings.aidl
index ffa8845..08f6130 100644
--- a/tv/tuner/aidl/android/hardware/tv/tuner/FrontendIsdbtSettings.aidl
+++ b/tv/tuner/aidl/android/hardware/tv/tuner/FrontendIsdbtSettings.aidl
@@ -32,12 +32,12 @@
     /**
      * Signal frequency in Hertz
      */
-    int frequency;
+    long frequency;
 
     /**
      * Signal end frequency in Hertz used by scan
      */
-    int endFrequency;
+    long endFrequency;
 
     FrontendSpectralInversion inversion = FrontendSpectralInversion.UNDEFINED;
 
diff --git a/tv/tuner/aidl/android/hardware/tv/tuner/FrontendScanAtsc3PlpInfo.aidl b/tv/tuner/aidl/android/hardware/tv/tuner/FrontendScanAtsc3PlpInfo.aidl
index 1fe2b1f..ac0c287 100644
--- a/tv/tuner/aidl/android/hardware/tv/tuner/FrontendScanAtsc3PlpInfo.aidl
+++ b/tv/tuner/aidl/android/hardware/tv/tuner/FrontendScanAtsc3PlpInfo.aidl
@@ -22,7 +22,7 @@
  */
 @VintfStability
 parcelable FrontendScanAtsc3PlpInfo {
-    byte plpId;
+    int plpId;
 
     boolean bLlsFlag;
 }
diff --git a/tv/tuner/aidl/android/hardware/tv/tuner/FrontendScanMessage.aidl b/tv/tuner/aidl/android/hardware/tv/tuner/FrontendScanMessage.aidl
index d89e9b1..19c6766 100644
--- a/tv/tuner/aidl/android/hardware/tv/tuner/FrontendScanMessage.aidl
+++ b/tv/tuner/aidl/android/hardware/tv/tuner/FrontendScanMessage.aidl
@@ -36,12 +36,12 @@
     /**
      * scan progress percent (0..100)
      */
-    byte progressPercent;
+    int progressPercent;
 
     /**
      * Signal frequencies in Hertz
      */
-    int[] frequencies;
+    long[] frequencies;
 
     /**
      * Symbols per second
@@ -52,11 +52,11 @@
 
     FrontendAnalogType analogType;
 
-    byte[] plpIds;
+    int[] plpIds;
 
-    byte[] groupIds;
+    int[] groupIds;
 
-    char[] inputStreamIds;
+    int[] inputStreamIds;
 
     FrontendScanMessageStandard std;
 
diff --git a/tv/tuner/aidl/android/hardware/tv/tuner/FrontendStatus.aidl b/tv/tuner/aidl/android/hardware/tv/tuner/FrontendStatus.aidl
index b9f73ad..ddbd0f8 100644
--- a/tv/tuner/aidl/android/hardware/tv/tuner/FrontendStatus.aidl
+++ b/tv/tuner/aidl/android/hardware/tv/tuner/FrontendStatus.aidl
@@ -83,14 +83,14 @@
 
     LnbVoltage lnbVoltage;
 
-    byte plpId;
+    int plpId;
 
     boolean isEWBS;
 
     /**
      * AGC value is normalized from 0 to 255.
      */
-    byte agc;
+    int agc;
 
     boolean isLnaOn;
 
@@ -104,7 +104,7 @@
     /**
      * Frequency difference in Hertz.
      */
-    int freqOffset;
+    long freqOffset;
 
     FrontendDvbtHierarchy hierarchy;
 
@@ -154,7 +154,7 @@
     /**
      * The current DVB-T2 system id status.
      */
-    char systemId;
+    int systemId;
 
     /**
      * Frontend Interleaving Modes.
@@ -164,7 +164,7 @@
     /**
      * Segments in ISDB-T Specification of all the channels.
      */
-    byte[] isdbtSegment;
+    int[] isdbtSegment;
 
     /**
      * Transport Stream Data Rate in BPS of the current channel.
diff --git a/tv/tuner/aidl/android/hardware/tv/tuner/FrontendStatusAtsc3PlpInfo.aidl b/tv/tuner/aidl/android/hardware/tv/tuner/FrontendStatusAtsc3PlpInfo.aidl
index c10a08c..6b44bc0 100644
--- a/tv/tuner/aidl/android/hardware/tv/tuner/FrontendStatusAtsc3PlpInfo.aidl
+++ b/tv/tuner/aidl/android/hardware/tv/tuner/FrontendStatusAtsc3PlpInfo.aidl
@@ -25,7 +25,7 @@
     /**
      * PLP Id value.
      */
-    byte plpId;
+    int plpId;
 
     /**
      * Demod Lock/Unlock status of this particular PLP.
diff --git a/tv/tuner/aidl/android/hardware/tv/tuner/PlaybackSettings.aidl b/tv/tuner/aidl/android/hardware/tv/tuner/PlaybackSettings.aidl
index 47d3db6..fc5cf63 100644
--- a/tv/tuner/aidl/android/hardware/tv/tuner/PlaybackSettings.aidl
+++ b/tv/tuner/aidl/android/hardware/tv/tuner/PlaybackSettings.aidl
@@ -34,13 +34,13 @@
      * Unused space size in bytes in the playback. The HAL uses it to trigger
      * InputStatus::SPACE_ALMOST_EMPTY.
      */
-    int lowThreshold;
+    long lowThreshold;
 
     /**
      * Unused space size in bytes in the playback. The HAL uses it to trigger
      * InputStatus::SPACE_ALMOST_FULL.
      */
-    int highThreshold;
+    long highThreshold;
 
     /**
      * The data format in the playback.
@@ -50,5 +50,5 @@
     /**
      * The packet size in bytes in the playback.
      */
-    byte packetSize;
+    long packetSize;
 }
diff --git a/tv/tuner/aidl/android/hardware/tv/tuner/RecordSettings.aidl b/tv/tuner/aidl/android/hardware/tv/tuner/RecordSettings.aidl
index 94370d6..ac851c6 100644
--- a/tv/tuner/aidl/android/hardware/tv/tuner/RecordSettings.aidl
+++ b/tv/tuner/aidl/android/hardware/tv/tuner/RecordSettings.aidl
@@ -34,13 +34,13 @@
      * Unconsumed data size in bytes in the record. The HAL uses it to trigger
      * OutputStatus::LOW_WATER.
      */
-    int lowThreshold;
+    long lowThreshold;
 
     /**
      * Unconsumed data size in bytes in the record. The HAL uses it to trigger
      * OutputStatus::High_WATER.
      */
-    int highThreshold;
+    long highThreshold;
 
     /**
      * The data format in the record.
@@ -50,5 +50,5 @@
     /**
      * The packet size in bytes in the record.
      */
-    byte packetSize;
+    long packetSize;
 }