From 76c927adb21d07475babe3b3867c8d31071beff1 Mon Sep 17 00:00:00 2001 From: chen xu Date: Wed, 6 Mar 2019 15:27:06 -0800 Subject: rename precise carrier id to specific carrier id Bug: 126727010 Test: atest CtsTelephonyTestCases Change-Id: I32c0948ab47dc34df9ed791c18d6ff79158c400a --- .../carrierconfig/DefaultCarrierConfigService.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/com/android/carrierconfig/DefaultCarrierConfigService.java b/src/com/android/carrierconfig/DefaultCarrierConfigService.java index d69722e..3458df4 100644 --- a/src/com/android/carrierconfig/DefaultCarrierConfigService.java +++ b/src/com/android/carrierconfig/DefaultCarrierConfigService.java @@ -79,14 +79,14 @@ public class DefaultCarrierConfigService extends CarrierService { XmlPullParser parser = mFactory.newPullParser(); if (id.getCarrierId() != TelephonyManager.UNKNOWN_CARRIER_ID) { PersistableBundle configByCarrierId = new PersistableBundle(); - PersistableBundle configByPreciseCarrierId = new PersistableBundle(); + PersistableBundle configBySpecificCarrierId = new PersistableBundle(); PersistableBundle configByMccMncFallBackCarrierId = new PersistableBundle(); int mccmncCarrierId = TelephonyManager.from(getApplicationContext()) .getCarrierIdFromMccMnc(id.getMcc() + id.getMnc()); for (String file : getApplicationContext().getAssets().list("")) { - if (file.startsWith(CARRIER_ID_PREFIX + id.getPreciseCarrierId() + "_")) { + if (file.startsWith(CARRIER_ID_PREFIX + id.getSpecificCarrierId() + "_")) { parser.setInput(getApplicationContext().getAssets().open(file), "utf-8"); - configByPreciseCarrierId = readConfigFromXml(parser, null); + configBySpecificCarrierId = readConfigFromXml(parser, null); break; } else if (file.startsWith(CARRIER_ID_PREFIX + id.getCarrierId() + "_")) { parser.setInput(getApplicationContext().getAssets().open(file), "utf-8"); @@ -97,9 +97,9 @@ public class DefaultCarrierConfigService extends CarrierService { } } - // priority: precise carrier id > carrier id > mccmnc fallback carrier id - if (!configByPreciseCarrierId.isEmpty()) { - config = configByPreciseCarrierId; + // priority: specific carrier id > carrier id > mccmnc fallback carrier id + if (!configBySpecificCarrierId.isEmpty()) { + config = configBySpecificCarrierId; } else if (!configByCarrierId.isEmpty()) { config = configByCarrierId; } else if (!configByMccMncFallBackCarrierId.isEmpty()) { @@ -215,7 +215,7 @@ public class DefaultCarrierConfigService extends CarrierService { *
  • imsi: {@link CarrierIdentifier#getImsi}
    • *
  • device: {@link Build.DEVICE}
    • *
  • cid: {@link CarrierIdentifier#getCarrierId()} - * or {@link CarrierIdentifier#getPreciseCarrierId()}
    • + * or {@link CarrierIdentifier#getSpecificCarrierId()} * *

    * @@ -258,7 +258,7 @@ public class DefaultCarrierConfigService extends CarrierService { break; case "cid": result = result && (value.equals(id.getCarrierId()) - || value.equals(id.getPreciseCarrierId())); + || value.equals(id.getSpecificCarrierId())); break; case "name": // name is used together with cid for readability. ignore for filter. -- cgit v1.2.3 From 4948f0d7cc882ee201eab4a2741f5ee9f8bbf91a Mon Sep 17 00:00:00 2001 From: chen xu Date: Thu, 7 Mar 2019 17:58:44 -0800 Subject: fix the issue that aapt2 strip leading 0 from the raw string aapt2 by defualt will strip leading 0 from raw strings if there is no schema defined. it will cause issues that will be interpreted as 2021 instead of 20201 Bug: 126605105 Test: Manual test Change-Id: I832a4b243121818a6808b90d8f459dd2c9421e72 --- Android.bp | 1 + 1 file changed, 1 insertion(+) diff --git a/Android.bp b/Android.bp index 782ccd4..efca57a 100644 --- a/Android.bp +++ b/Android.bp @@ -10,4 +10,5 @@ android_app { optimize: { proguard_flags_files: ["proguard.flags"], }, + aaptflags: ["--keep-raw-values"], } -- cgit v1.2.3