commit ed3e74706f58c83fc2c1d61453d746df919ae2e3
author Amit Mahajan <amitmahajan@google.com> Wed Apr 13 17:46:42 2016 -0700
committer Amit Mahajan <amitmahajan@google.com> Wed Apr 13 17:46:42 2016 -0700
tree ac2f6e6933cf8fb05b89633afcb30a0d942d8b7f
parent 45cbead9ab8289b993a13aff335a5ec97b9c1673

Change to treat no bearer_bitmask specified in APNs xml as bitmask 0.

Bug: 28177370
Change-Id: Ie1cda9e150ab5359008f4a4d7ae27eb4af1d9ef9

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 808a660..23e75f2 100644
--- a/src/com/android/providers/telephony/TelephonyProvider.java
+++ b/src/com/android/providers/telephony/TelephonyProvider.java
@@ -1081,11 +1081,12 @@
             addBoolAttribute(parser, "modem_cognitive", map, MODEM_COGNITIVE);
             addBoolAttribute(parser, "user_visible", map, USER_VISIBLE);
 
+            int bearerBitmask = 0;
             String bearerList = parser.getAttributeValue(null, "bearer_bitmask");
             if (bearerList != null) {
-                int bearerBitmask = ServiceState.getBitmaskFromString(bearerList);
-                map.put(BEARER_BITMASK, bearerBitmask);
+                bearerBitmask = ServiceState.getBitmaskFromString(bearerList);
             }
+            map.put(BEARER_BITMASK, bearerBitmask);
 
             String mvno_type = parser.getAttributeValue(null, "mvno_type");
             if (mvno_type != null) {