aboutsummaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorMeng Wang <mewan@google.com>2020-06-11 15:58:45 -0700
committerMeng Wang <mewan@google.com>2020-06-11 17:12:37 -0700
commit3e7f81f982cddc920a9c6bce7ccc8a7c1540cca9 (patch)
tree08d84a434b5b52bfe20f71071bf743f1e77936b5 /java
parent8243123bf2ab46c7b53420c70ca54f29e0fa9b34 (diff)
downloadplatform_tools_carrier_settings-android11-dev.tar.gz
platform_tools_carrier_settings-android11-dev.tar.bz2
platform_tools_carrier_settings-android11-dev.zip
CarrierConfigConverterV2 should accept version as long instead of int.android11-dev
Bug: 158782699 Test: manual - the tool runs. Change-Id: I4d7ae3f4f5cf4f7d5da59dcdd7f170e3b3015e41
Diffstat (limited to 'java')
-rw-r--r--java/CarrierConfigConverterV2.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/java/CarrierConfigConverterV2.java b/java/CarrierConfigConverterV2.java
index 2351e33..830bb3c 100644
--- a/java/CarrierConfigConverterV2.java
+++ b/java/CarrierConfigConverterV2.java
@@ -100,7 +100,7 @@ public final class CarrierConfigConverterV2 {
private String outputDir = "/tmp/carrierconfig/out";
@Parameter(names = "--version", description = "The version number for all output textpb.")
- private int version = 1;
+ private long version = 1L;
// For configs in vendor.xml w/o mcc/mnc, they are the default config values for all carriers.
// In CarrierSettings, a special mcc/mnc "000000" is used to look up default config.
@@ -127,7 +127,7 @@ public final class CarrierConfigConverterV2 {
/** Entry point when invoked from other Java code, eg. the server side conversion tool. */
public static void convert(
- String vendorXmlFile, String assetsDirName, String outputDir, int version)
+ String vendorXmlFile, String assetsDirName, String outputDir, long version)
throws IOException {
CarrierConfigConverterV2 converter = new CarrierConfigConverterV2();
converter.vendorXmlFiles = ImmutableList.of(vendorXmlFile);