commit 69740ebc934ff66e60297ea701c85290602c4217
author gitbuildkicker <android-build@google.com> Thu Dec 08 00:08:44 2016 -0800
committer gitbuildkicker <android-build@google.com> Thu Dec 08 00:08:44 2016 -0800
tree f06c1218e607a95f719fa5e984f8db8d081fcb5a
parent 55785c43f3eb5b488cc3598ccba7f3b940cdfb83
parent a627722cfa0856605b9fe86b0a6cac27bf97d85c

merge in oc-release history after reset to master

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 99d0c3b..b816e5f 100644
--- a/src/com/android/providers/telephony/TelephonyProvider.java
+++ b/src/com/android/providers/telephony/TelephonyProvider.java
@@ -1092,7 +1092,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);