| commit | 96eee697d61cc6baf29b1531dceff6c7b76be1b2 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Sat Feb 26 12:45:04 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Feb 26 12:45:04 2022 +0000 |
| tree | fc9a2637f0ad276b5f9d0be0e79c5fc3e62e45e1 | |
| parent | d42e01a785509f25012f008d59437b97e753dda5 [diff] | |
| parent | efbeef6438c14f9979e962f0c06d80765cbe3978 [diff] |
Merge "Parsing mcc and mnc as integers when null does not work" am: efbeef6438 Original change: https://android-review.googlesource.com/c/platform/packages/providers/TelephonyProvider/+/1989566 Change-Id: I5c6b7898864fe125c9a274be800ad237d6e42738
diff --git a/src/com/android/providers/telephony/TelephonyProvider.java b/src/com/android/providers/telephony/TelephonyProvider.java index 956cebf..be42ab3 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