Snap for 8728200 from cf47fa06f971b8c8bfcaeacbb9a08a594d826b06 to s-keystone-qcom-release

Change-Id: I055f2171a0f8942387c1cc7a63012de62483e0de

2 files changed, 7 insertions, 2 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;
     }
diff --git a/src/com/android/settings/network/telephony/UserPLMNListActivity.java b/src/com/android/settings/network/telephony/UserPLMNListActivity.java
index 283b1b4bf8..a49ce87e43 100755
--- a/src/com/android/settings/network/telephony/UserPLMNListActivity.java
+++ b/src/com/android/settings/network/telephony/UserPLMNListActivity.java
@@ -598,7 +598,9 @@ public class UserPLMNListActivity extends PreferenceActivity
             list.add(mUPLMNList.get(i));
         }
 
-        list.remove(position);
+        if (position >= 0) {
+            list.remove(position);
+        }
         network.setOperatorNumeric(null);
         list.add(network);