From a5f84605a873b1150aaccec3d78ca7ea4b6dd34e Mon Sep 17 00:00:00 2001
From: Romuald Brunet <romuald@chivil.com>
Date: Sun, 29 Jul 2012 14:03:34 +0200
Subject: [PATCH] MMS app: fix crash when MMSC setting is NULL

An APN with a null MMSC column prevented the MMS app
to find the next APN in query.

Change-Id: I50abc7f0b80c1172e4bf7b1779c0efb8b79899bc
---
 src/com/android/mms/transaction/TransactionSettings.java | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/com/android/mms/transaction/TransactionSettings.java b/src/com/android/mms/transaction/TransactionSettings.java
index a0862989c..ea7fc5537 100644
--- 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()) {