Merge tag 'LA.QSSI.12.0.r1-08300-qssi.0' into sugisawa-mr1HEADsugisawa-mr1

"LA.QSSI.12.0.r1-08300-qssi.0"

Change-Id: I4693d4e59416ffc3f2679fc8959757e92325b445

1 files changed, 4 insertions, 1 deletions

diff --git a/src/com/android/settings/network/telephony/UserPLMNEditorActivity.java b/src/com/android/settings/network/telephony/UserPLMNEditorActivity.java
index 47e0836dda..dfac3fa180 100755
--- a/src/com/android/settings/network/telephony/UserPLMNEditorActivity.java
+++ b/src/com/android/settings/network/telephony/UserPLMNEditorActivity.java
@@ -40,6 +40,7 @@ import android.content.Intent;
 import android.content.IntentFilter;
 import android.text.InputType;
 import android.text.Editable;
+import android.text.TextUtils;
 import android.text.TextWatcher;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -318,7 +319,9 @@ public class UserPLMNEditorActivity extends PreferenceActivity implements
         Log.d(LOG_TAG, "plmn = " + plmn);
         String[] CuPlmnArray = getResources().getStringArray(R.array.uplmn_cu_mcc_mnc_values);
         for (String CuPlmn : CuPlmnArray) {
-            if (plmn.equals(CuPlmn)) return R.array.uplmn_prefer_network_mode_w_choices;
+            if (!TextUtils.isEmpty(plmn) && plmn.equals(CuPlmn)) {
+                return R.array.uplmn_prefer_network_mode_w_choices;
+            }
         }
         return R.array.uplmn_prefer_network_mode_td_choices;
     }