Parsing mcc and mnc as integers when null does not work
When overlay parsing for mcc and mnc was added to make sure that
the RRO apns got the correct format we did not count
on it being null. This causes a NumberformatException.
Since the format parsing was only done/needed for RROs this
was not seen until only carrier id was used for overlays.
Test: Add an APN in a RRO with only carrier id and no mcc/mnc data
Bug: 217871446
Change-Id: I3269a201fe902e96675ec5b73ef948cedc5b17ee
diff --git a/src/com/android/providers/telephony/TelephonyProvider.java b/src/com/android/providers/telephony/TelephonyProvider.java
index a77fa7c..1899e25 100644
--- a/src/com/android/providers/telephony/TelephonyProvider.java
+++ b/src/com/android/providers/telephony/TelephonyProvider.java
@@ -2392,7 +2392,7 @@
String mncString = mnc;
// Since an mnc can have both two and three digits and it is hard to verify
// all OEM's Global APN lists we only do this for overlays.
- if (isOverlay) {
+ if (isOverlay && mcc !=null && mnc != null) {
mccString = String.format("%03d", Integer.parseInt(mcc));
// Looks up a two digit mnc in the carrier id DB
// if not found a three digit mnc value is chosen
