PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Rename calls to isGlobalModeEnabled" am: b6fd42a06a am: c03048cd27

Browse Source 
Change-Id: I65d13bbddb91cec3b67580ae1d8f9f9889893de3
This commit is contained in:
Sarah Chin
2020-03-31 23:27:10 +00:00
committed by Automerger Merge Worker
parent 6e791da6cd c03048cd27
commit ba99375f1b
6 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/CryptKeeper.java
View File

@@ -915,7 +915,7 @@ public class CryptKeeper extends Activity implements TextView.OnEditorActionList
* phone that has no encryption.
*/
private final void setAirplaneModeIfNecessary() {
if (!getTelephonyManager().isGlobalModeEnabled()) {
if (!getTelephonyManager().isLteCdmaEvdoGsmWcdmaEnabled()) {
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);

2
src/com/android/settings/deviceinfo/imei/ImeiInfoDialogController.java
View File

@@ -147,7 +147,7 @@ public class ImeiInfoDialogController {
@VisibleForTesting
boolean isCdmaLteEnabled() {
return mTelephonyManager.isGlobalModeEnabled();
return mTelephonyManager.isLteCdmaEvdoGsmWcdmaEnabled();
}
boolean isSimPresent(int slotId) {

2
src/com/android/settings/network/telephony/DataServiceSetupPreferenceController.java
View File

@@ -52,7 +52,7 @@ public class DataServiceSetupPreferenceController extends TelephonyBasePreferenc
&& carrierConfig != null
&& !carrierConfig.getBoolean(
CarrierConfigManager.KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL)
&& mTelephonyManager.isGlobalModeEnabled() && !TextUtils.isEmpty(mSetupUrl)
&& mTelephonyManager.isLteCdmaEvdoGsmWcdmaEnabled() && !TextUtils.isEmpty(mSetupUrl)
? AVAILABLE
: CONDITIONALLY_UNAVAILABLE;
}

4
src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java
View File

@@ -151,7 +151,7 @@ public class EnabledNetworkModePreferenceController extends
mTelephonyManager = mContext.getSystemService(TelephonyManager.class)
.createForSubscriptionId(mSubId);
mIsGlobalCdma = mTelephonyManager.isGlobalModeEnabled()
mIsGlobalCdma = mTelephonyManager.isLteCdmaEvdoGsmWcdmaEnabled()
&& carrierConfig.getBoolean(CarrierConfigManager.KEY_SHOW_CDMA_CHOICES_BOOL);
mShow4GForLTE = carrierConfig != null
? carrierConfig.getBoolean(
@@ -183,7 +183,7 @@ public class EnabledNetworkModePreferenceController extends
mContext.getContentResolver(),
android.provider.Settings.Global.PREFERRED_NETWORK_MODE + mSubId,
Phone.PREFERRED_NT_MODE);
if (mTelephonyManager.isGlobalModeEnabled()) {
if (mTelephonyManager.isLteCdmaEvdoGsmWcdmaEnabled()) {
if (lteForced == 0) {
preference.setEntries(
R.array.enabled_networks_cdma_choices);

4
src/com/android/settings/network/telephony/PreferredNetworkModePreferenceController.java
View File

@@ -102,7 +102,7 @@ public class PreferredNetworkModePreferenceController extends TelephonyBasePrefe
mTelephonyManager = mContext.getSystemService(TelephonyManager.class)
.createForSubscriptionId(mSubId);
mIsGlobalCdma = mTelephonyManager.isGlobalModeEnabled()
mIsGlobalCdma = mTelephonyManager.isLteCdmaEvdoGsmWcdmaEnabled()
&& carrierConfig.getBoolean(CarrierConfigManager.KEY_SHOW_CDMA_CHOICES_BOOL);
}
@@ -129,7 +129,7 @@ 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:
return mTelephonyManager.isGlobalModeEnabled()
return mTelephonyManager.isLteCdmaEvdoGsmWcdmaEnabled()
? R.string.preferred_network_mode_cdma_summary
: R.string.preferred_network_mode_cdma_evdo_summary;
case TelephonyManagerConstants.NETWORK_MODE_CDMA_NO_EVDO:

6
tests/robotests/src/com/android/settings/network/telephony/DataServiceSetupPreferenceControllerTest.java
View File

@@ -90,7 +90,7 @@ public class DataServiceSetupPreferenceControllerTest {
@Test
public void getAvailabilityStatus_allConfigOn_returnAvailable() {
doReturn(true).when(mTelephonyManager).isGlobalModeEnabled();
doReturn(true).when(mTelephonyManager).isLteCdmaEvdoGsmWcdmaEnabled();
mCarrierConfig.putBoolean(CarrierConfigManager.KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL,
false);
@@ -101,7 +101,7 @@ public class DataServiceSetupPreferenceControllerTest {
public void getAvailabilityStatus_missUrl_returnUnavailable() {
Settings.Global.putString(mContext.getContentResolver(),
Settings.Global.SETUP_PREPAID_DATA_SERVICE_URL, "");
doReturn(true).when(mTelephonyManager).isGlobalModeEnabled();
doReturn(true).when(mTelephonyManager).isLteCdmaEvdoGsmWcdmaEnabled();
mCarrierConfig.putBoolean(CarrierConfigManager.KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL,
false);
@@ -113,7 +113,7 @@ public class DataServiceSetupPreferenceControllerTest {
@Test
public void getAvailabilityStatus_notCdma_returnUnavailable() {
doReturn(false).when(mTelephonyManager).isGlobalModeEnabled();
doReturn(false).when(mTelephonyManager).isLteCdmaEvdoGsmWcdmaEnabled();
mCarrierConfig.putBoolean(CarrierConfigManager.KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL,
false);