commit b9ab158a5e0b05500816018f8080ada14554c86e
author Paul Duffin <paulduffin@google.com> Wed Jan 18 15:27:41 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jan 18 15:27:41 2017 +0000
tree bb3a599abc8056663aa565501d5a77a7a333f1bb
parent c8b8b285ce1fb27972d5845a650a64eaed3e3c04
parent 6ac6a41207f3e6e352d115c469d5a7601cce1289

Merge "Prepare for removal of legacy-test from default targets" am: 794a36fcb5 am: 59aa290a93
am: 6ac6a41207

Change-Id: I62ebcd99b981b16da54f9c1e7d60b3a04ca63861

src/com/android/providers/telephony/TelephonyProvider.java

diff --git a/src/com/android/providers/telephony/TelephonyProvider.java b/src/com/android/providers/telephony/TelephonyProvider.java
index 02472a8..2ece324 100644
--- a/src/com/android/providers/telephony/TelephonyProvider.java
+++ b/src/com/android/providers/telephony/TelephonyProvider.java
@@ -1093,7 +1093,14 @@
             addStringAttribute(parser, "mmsproxy", map, MMSPROXY);
             addStringAttribute(parser, "mmsport", map, MMSPORT);
             addStringAttribute(parser, "mmsc", map, MMSC);
-            addStringAttribute(parser, "type", map, TYPE);
+
+            String apnType = parser.getAttributeValue(null, "type");
+            if (apnType != null) {
+                // Remove spaces before putting it in the map.
+                apnType = apnType.replaceAll("\\s+", "");
+                map.put(TYPE, apnType);
+            }
+
             addStringAttribute(parser, "protocol", map, PROTOCOL);
             addStringAttribute(parser, "roaming_protocol", map, ROAMING_PROTOCOL);