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

4 files changed, 26 insertions, 18 deletions

diff --git a/src/com/android/settings/network/PrivateDnsPreferenceController.java b/src/com/android/settings/network/PrivateDnsPreferenceController.java
index 07d57140ec..ed6f9ed955 100644
--- a/src/com/android/settings/network/PrivateDnsPreferenceController.java
+++ b/src/com/android/settings/network/PrivateDnsPreferenceController.java
@@ -85,9 +85,12 @@ public class PrivateDnsPreferenceController extends BasePreferenceController
 
     @Override
     public int getAvailabilityStatus() {
-        return mContext.getResources().getBoolean(R.bool.config_show_private_dns_settings)
-                ? AVAILABLE
-                : UNSUPPORTED_ON_DEVICE;
+        if (!mContext.getResources().getBoolean(R.bool.config_show_private_dns_settings)) {
+            return UNSUPPORTED_ON_DEVICE;
+        }
+        final UserManager userManager = mContext.getSystemService(UserManager.class);
+        if (userManager.isGuestUser()) return DISABLED_FOR_USER;
+        return AVAILABLE;
     }
 
     @Override
diff --git a/src/com/android/settings/network/telephony/NetworkScanHelper.java b/src/com/android/settings/network/telephony/NetworkScanHelper.java
index 081a4978ab..cd686db046 100644
--- a/src/com/android/settings/network/telephony/NetworkScanHelper.java
+++ b/src/com/android/settings/network/telephony/NetworkScanHelper.java
@@ -232,20 +232,20 @@ public class NetworkScanHelper {
         if (mNetworkScanRequester != null) {
             mNetworkScanRequester.stopScan();
             mNetworkScanRequester = null;
-        }
-
-        try {
-            int slotIndex = mTelephonyManager.getSlotIndex();
-            if (slotIndex >= 0 && slotIndex < mTelephonyManager.getActiveModemCount()) {
-                TelephonyUtils.abortIncrementalScan(mContext, slotIndex);
-            } else {
-                Log.d(TAG, "slotIndex is invalid, skipping abort");
+        } else {
+            try {
+                int slotIndex = mTelephonyManager.getSlotIndex();
+                if (slotIndex >= 0 && slotIndex < mTelephonyManager.getActiveModemCount()) {
+                    TelephonyUtils.abortIncrementalScan(mContext, slotIndex);
+                } else {
+                    Log.d(TAG, "slotIndex is invalid, skipping abort");
+                }
+                mContext.unregisterReceiver(mLegacyIncrScanReceiver);
+            } catch (NullPointerException ex) {
+                Log.e(TAG, "abortIncrementalScan Exception: ", ex);
+            } catch (IllegalArgumentException ex) {
+                Log.e(TAG, "IllegalArgumentException");
             }
-            mContext.unregisterReceiver(mLegacyIncrScanReceiver);
-        } catch (NullPointerException ex) {
-            Log.e(TAG, "abortIncrementalScan Exception: ", ex);
-        } catch (IllegalArgumentException ex) {
-            Log.e(TAG, "IllegalArgumentException");
         }
     }
 
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);