Merge "MMS app: fix crash when MMSC setting is NULL" into ics

BobZhome · Aug 10, 2012 · 6affc39 · 6affc39
2 parents cc8e5ab + a5f8460
commit 6affc39
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/com/android/mms/transaction/TransactionSettings.java b/src/com/android/mms/transaction/TransactionSettings.java
@@ -84,8 +84,13 @@ public TransactionSettings(Context context, String apnName) {
                 // Read values from APN settings
                 if (isValidApnType(cursor.getString(COLUMN_TYPE), Phone.APN_TYPE_MMS)) {
                     sawValidApn = true;
-                    mServiceCenter = NetworkUtils.trimV4AddrZeros(
-                            cursor.getString(COLUMN_MMSC).trim());
+
+                    String MMSC = cursor.getString(COLUMN_MMSC);
+                    if (MMSC == null) {
+                        continue;
+                    }
+
+                    mServiceCenter = NetworkUtils.trimV4AddrZeros(MMSC.trim());
                     mProxyAddress = NetworkUtils.trimV4AddrZeros(
                             cursor.getString(COLUMN_MMSPROXY));
                     if (isProxySet()) {