diff --git a/src/com/android/settings/CryptKeeper.java b/src/com/android/settings/CryptKeeper.java index df912db83a8..ca137b7bf07 100644 --- a/src/com/android/settings/CryptKeeper.java +++ b/src/com/android/settings/CryptKeeper.java @@ -60,7 +60,6 @@ import android.widget.Button; import android.widget.ProgressBar; import android.widget.TextView; -import com.android.internal.telephony.PhoneConstants; import com.android.internal.widget.LockPatternUtils; import com.android.internal.widget.LockPatternView; import com.android.internal.widget.LockPatternView.Cell; @@ -916,9 +915,7 @@ public class CryptKeeper extends Activity implements TextView.OnEditorActionList * phone that has no encryption. */ private final void setAirplaneModeIfNecessary() { - final boolean isLteDevice = - getTelephonyManager().getLteOnCdmaMode() == PhoneConstants.LTE_ON_CDMA_TRUE; - if (!isLteDevice) { + if (!getTelephonyManager().isGlobalModeEnabled()) { Log.d(TAG, "Going into airplane mode."); Settings.Global.putInt(getContentResolver(), Settings.Global.AIRPLANE_MODE_ON, 1); final Intent intent = new Intent(Intent.ACTION_AIRPLANE_MODE_CHANGED); diff --git a/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogController.java b/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogController.java index 5c3772bac8d..2ee77d9d768 100644 --- a/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogController.java +++ b/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogController.java @@ -31,7 +31,6 @@ import android.util.Log; import androidx.annotation.NonNull; import androidx.annotation.VisibleForTesting; -import com.android.internal.telephony.PhoneConstants; import com.android.settings.R; public class ImeiInfoDialogController { @@ -147,8 +146,7 @@ public class ImeiInfoDialogController { @VisibleForTesting boolean isCdmaLteEnabled() { - return mTelephonyManager.getLteOnCdmaMode(mSubscriptionInfo.getSubscriptionId()) - == PhoneConstants.LTE_ON_CDMA_TRUE; + return mTelephonyManager.isGlobalModeEnabled(); } @VisibleForTesting diff --git a/src/com/android/settings/network/telephony/DataServiceSetupPreferenceController.java b/src/com/android/settings/network/telephony/DataServiceSetupPreferenceController.java index 46f398c1896..da2bff739f1 100644 --- a/src/com/android/settings/network/telephony/DataServiceSetupPreferenceController.java +++ b/src/com/android/settings/network/telephony/DataServiceSetupPreferenceController.java @@ -28,8 +28,6 @@ import android.text.TextUtils; import androidx.preference.Preference; -import com.android.internal.telephony.PhoneConstants; - /** * Preference controller for "Data service setup" */ @@ -49,14 +47,12 @@ public class DataServiceSetupPreferenceController extends TelephonyBasePreferenc @Override public int getAvailabilityStatus(int subId) { - final boolean isLteOnCdma = mTelephonyManager.getLteOnCdmaMode() - == PhoneConstants.LTE_ON_CDMA_TRUE; final PersistableBundle carrierConfig = mCarrierConfigManager.getConfigForSubId(subId); return subId != SubscriptionManager.INVALID_SUBSCRIPTION_ID && carrierConfig != null && !carrierConfig.getBoolean( CarrierConfigManager.KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL) - && isLteOnCdma && !TextUtils.isEmpty(mSetupUrl) + && mTelephonyManager.isGlobalModeEnabled() && !TextUtils.isEmpty(mSetupUrl) ? AVAILABLE : CONDITIONALLY_UNAVAILABLE; } diff --git a/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java b/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java index f7ed1d0e4ce..2866b5483e4 100644 --- a/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java +++ b/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java @@ -151,9 +151,7 @@ public class EnabledNetworkModePreferenceController extends mTelephonyManager = mContext.getSystemService(TelephonyManager.class) .createForSubscriptionId(mSubId); - final boolean isLteOnCdma = - mTelephonyManager.getLteOnCdmaMode() == PhoneConstants.LTE_ON_CDMA_TRUE; - mIsGlobalCdma = isLteOnCdma + mIsGlobalCdma = mTelephonyManager.isGlobalModeEnabled() && carrierConfig.getBoolean(CarrierConfigManager.KEY_SHOW_CDMA_CHOICES_BOOL); mShow4GForLTE = carrierConfig != null ? carrierConfig.getBoolean( @@ -181,13 +179,11 @@ public class EnabledNetworkModePreferenceController extends mContext.getContentResolver(), android.provider.Settings.Global.LTE_SERVICE_FORCED + mSubId, 0); - final boolean isLteOnCdma = mTelephonyManager.getLteOnCdmaMode() - == PhoneConstants.LTE_ON_CDMA_TRUE; final int settingsNetworkMode = android.provider.Settings.Global.getInt( mContext.getContentResolver(), android.provider.Settings.Global.PREFERRED_NETWORK_MODE + mSubId, Phone.PREFERRED_NT_MODE); - if (isLteOnCdma) { + if (mTelephonyManager.isGlobalModeEnabled()) { if (lteForced == 0) { preference.setEntries( R.array.enabled_networks_cdma_choices); diff --git a/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceController.java b/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceController.java index ebf6ec122c2..caadba66bfd 100644 --- a/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceController.java +++ b/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceController.java @@ -102,9 +102,7 @@ public class PreferredNetworkModePreferenceController extends TelephonyBasePrefe mTelephonyManager = mContext.getSystemService(TelephonyManager.class) .createForSubscriptionId(mSubId); - final boolean isLteOnCdma = - mTelephonyManager.getLteOnCdmaMode() == PhoneConstants.LTE_ON_CDMA_TRUE; - mIsGlobalCdma = isLteOnCdma + mIsGlobalCdma = mTelephonyManager.isGlobalModeEnabled() && carrierConfig.getBoolean(CarrierConfigManager.KEY_SHOW_CDMA_CHOICES_BOOL); } @@ -131,12 +129,9 @@ public class PreferredNetworkModePreferenceController extends TelephonyBasePrefe case TelephonyManagerConstants.NETWORK_MODE_GSM_UMTS: return R.string.preferred_network_mode_gsm_wcdma_summary; case TelephonyManagerConstants.NETWORK_MODE_CDMA_EVDO: - switch (mTelephonyManager.getLteOnCdmaMode()) { - case PhoneConstants.LTE_ON_CDMA_TRUE: - return R.string.preferred_network_mode_cdma_summary; - default: - return R.string.preferred_network_mode_cdma_evdo_summary; - } + return mTelephonyManager.isGlobalModeEnabled() + ? R.string.preferred_network_mode_cdma_summary + : R.string.preferred_network_mode_cdma_evdo_summary; case TelephonyManagerConstants.NETWORK_MODE_CDMA_NO_EVDO: return R.string.preferred_network_mode_cdma_only_summary; case TelephonyManagerConstants.NETWORK_MODE_EVDO_NO_CDMA: diff --git a/tests/robotests/src/com/android/settings/network/telephony/DataServiceSetupPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/DataServiceSetupPreferenceControllerTest.java index 46e69782b51..ddfae6401ed 100644 --- a/tests/robotests/src/com/android/settings/network/telephony/DataServiceSetupPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/telephony/DataServiceSetupPreferenceControllerTest.java @@ -24,9 +24,7 @@ import static com.google.common.truth.Truth.assertThat; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.verify; -import android.app.Activity; import android.content.Context; import android.content.Intent; import android.net.Uri; @@ -39,7 +37,6 @@ import android.text.TextUtils; import androidx.preference.Preference; -import com.android.internal.telephony.PhoneConstants; import com.android.settingslib.RestrictedPreference; import org.junit.Before; @@ -48,7 +45,6 @@ import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import org.robolectric.Robolectric; import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; @@ -94,7 +90,7 @@ public class DataServiceSetupPreferenceControllerTest { @Test public void getAvailabilityStatus_allConfigOn_returnAvailable() { - doReturn(PhoneConstants.LTE_ON_CDMA_TRUE).when(mTelephonyManager).getLteOnCdmaMode(); + doReturn(true).when(mTelephonyManager).isGlobalModeEnabled(); mCarrierConfig.putBoolean(CarrierConfigManager.KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL, false); @@ -105,7 +101,7 @@ public class DataServiceSetupPreferenceControllerTest { public void getAvailabilityStatus_missUrl_returnUnavailable() { Settings.Global.putString(mContext.getContentResolver(), Settings.Global.SETUP_PREPAID_DATA_SERVICE_URL, ""); - doReturn(PhoneConstants.LTE_ON_CDMA_TRUE).when(mTelephonyManager).getLteOnCdmaMode(); + doReturn(true).when(mTelephonyManager).isGlobalModeEnabled(); mCarrierConfig.putBoolean(CarrierConfigManager.KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL, false); @@ -117,7 +113,7 @@ public class DataServiceSetupPreferenceControllerTest { @Test public void getAvailabilityStatus_notCdma_returnUnavailable() { - doReturn(PhoneConstants.LTE_ON_CDMA_FALSE).when(mTelephonyManager).getLteOnCdmaMode(); + doReturn(false).when(mTelephonyManager).isGlobalModeEnabled(); mCarrierConfig.putBoolean(CarrierConfigManager.KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL, false);