commit 028379115086b3b2d3adfdd1c79b7e6b3ef12861
author Meng Wang <mewan@google.com> Fri Jun 12 02:11:10 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jun 12 02:11:10 2020 +0000
tree 08d84a434b5b52bfe20f71071bf743f1e77936b5
parent 2d0053a8471964e1651e7ee2a4d166ced71939ad
parent 9e53ab73b4febf69ac5da42ca723b57e57feec75

CarrierConfigConverterV2 should accept version as long instead of int. am: 3e7f81f982 am: 9e53ab73b4

Original change: https://googleplex-android-review.googlesource.com/c/platform/tools/carrier_settings/+/11843109

Change-Id: I73c5721fdc9320fcfab2a6cf3ac028fef8294137

java/CarrierConfigConverterV2.java

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 @@
   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 @@
 
   /** 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);