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

Merge "[Settings] Refactor MobileNetworkUtils"

Browse Source
This commit is contained in:
TreeHugger Robot
2021-10-04 03:18:12 +00:00
committed by Android (Google) Code Review
parent f3e917b850 1eef718549
commit 0f933bcc00
1 changed files with 15 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/settings/network/telephony/MobileNetworkUtils.java
View File

@@ -468,10 +468,7 @@ public class MobileNetworkUtils {
return false; return false;
} }
if (!isWorldMode(context, subId)) { if (isWorldMode(context, subId)) {
return isGsmBasicOptions(context, subId);
}
final int networkMode = getNetworkTypeFromRaf( final int networkMode = getNetworkTypeFromRaf(
(int) telephonyManager.getAllowedNetworkTypesForReason( (int) telephonyManager.getAllowedNetworkTypesForReason(
TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_USER)); TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_USER));
@@ -482,15 +479,12 @@ public class MobileNetworkUtils {
return false; return false;
} }
if (isGsmBasicOptions(context, subId)) {
return true;
}
if (networkMode == TelephonyManagerConstants.NETWORK_MODE_LTE_GSM_WCDMA) { if (networkMode == TelephonyManagerConstants.NETWORK_MODE_LTE_GSM_WCDMA) {
return true; return true;
} }
}
return false; return isGsmBasicOptions(context, subId);
} }
/** /**