diff options
| author | Meng Wang <mewan@google.com> | 2020-06-12 02:11:10 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-12 02:11:10 +0000 |
| commit | 028379115086b3b2d3adfdd1c79b7e6b3ef12861 (patch) | |
| tree | 08d84a434b5b52bfe20f71071bf743f1e77936b5 | |
| parent | 2d0053a8471964e1651e7ee2a4d166ced71939ad (diff) | |
| parent | 9e53ab73b4febf69ac5da42ca723b57e57feec75 (diff) | |
| download | carrier_settings-android11-qpr1-release.tar.gz | |
CarrierConfigConverterV2 should accept version as long instead of int. am: 3e7f81f982 am: 9e53ab73b4android-11.0.0_r48android-11.0.0_r47android-11.0.0_r46android-11.0.0_r45android-11.0.0_r44android-11.0.0_r43android-11.0.0_r42android-11.0.0_r41android-11.0.0_r40android-11.0.0_r39android-11.0.0_r38android-11.0.0_r37android-11.0.0_r36android-11.0.0_r35android-11.0.0_r34android-11.0.0_r33android-11.0.0_r32android-11.0.0_r31android-11.0.0_r30android-11.0.0_r29android-11.0.0_r28android-11.0.0_r27android-11.0.0_r26android-11.0.0_r24android-11.0.0_r23android-11.0.0_r22android-11.0.0_r21android-11.0.0_r20android-11.0.0_r19android-11.0.0_r18android11-qpr3-s1-releaseandroid11-qpr3-releaseandroid11-qpr2-releaseandroid11-qpr1-s2-releaseandroid11-qpr1-s1-releaseandroid11-qpr1-releaseandroid11-qpr1-d-s1-releaseandroid11-qpr1-d-releaseandroid11-qpr1-c-releaseandroid11-d2-release
Original change: https://googleplex-android-review.googlesource.com/c/platform/tools/carrier_settings/+/11843109
Change-Id: I73c5721fdc9320fcfab2a6cf3ac028fef8294137
| -rw-r--r-- | java/CarrierConfigConverterV2.java | 4 |
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); |