commit bf11e4756248b5d26e615647b162622b2546930f
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Jul 21 20:08:40 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jul 21 20:08:40 2017 +0000
tree 596f4cf15958dd0ab2063889c9e17b1dc8bc37e8
parent 1230d603b10a684694ff61a13ea0d079b3e33e6f
parent c0e7bb788ae7ced1de1124cd2b7f5f4f0f60a785

Merge "Set default preferred network only when registered on home network." into oc-dr1-dev

src/com/android/phone/MobileNetworkSettings.java

diff --git a/src/com/android/phone/MobileNetworkSettings.java b/src/com/android/phone/MobileNetworkSettings.java
index 4650744..7a5006a 100644
--- a/src/com/android/phone/MobileNetworkSettings.java
+++ b/src/com/android/phone/MobileNetworkSettings.java
@@ -43,6 +43,7 @@
 import android.provider.Settings;
 import android.telephony.CarrierConfigManager;
 import android.telephony.PhoneStateListener;
+import android.telephony.ServiceState;
 import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
@@ -668,7 +669,9 @@
                 prefSet.removePreference(mLteDataServicePref);
             } else if (carrierConfig.getBoolean(CarrierConfigManager
                     .KEY_HIDE_PREFERRED_NETWORK_TYPE_BOOL)
-                    && !mPhone.getServiceState().getRoaming()) {
+                    && !mPhone.getServiceState().getRoaming()
+                    && mPhone.getServiceState().getDataRegState()
+                    == ServiceState.STATE_IN_SERVICE) {
                 prefSet.removePreference(mButtonPreferredNetworkMode);
                 prefSet.removePreference(mButtonEnabledNetworks);