From b74ccf7f3361c286d9291210477ee3f0b832f319 Mon Sep 17 00:00:00 2001
From: Bonian Chen <bonianchen@google.com>
Date: Fri, 1 Oct 2021 19:10:28 +0800
Subject: [PATCH] [Settings] Refactor MobileNetworkUtils

Code refactor MobileNetworkUtils
  - reduce number of accessing to isWorldMode()

Bug: 201757298
Test: presubmit pass
Change-Id: I710255887b5ba8038c3faf5471a88a02a15c015e
---
 .../network/telephony/MobileNetworkUtils.java       | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/com/android/settings/network/telephony/MobileNetworkUtils.java b/src/com/android/settings/network/telephony/MobileNetworkUtils.java
index f20a5bbadf5..49acd3926ac 100644
--- a/src/com/android/settings/network/telephony/MobileNetworkUtils.java
+++ b/src/com/android/settings/network/telephony/MobileNetworkUtils.java
@@ -468,11 +468,14 @@ public class MobileNetworkUtils {
             return false;
         }
 
+        if (!isWorldMode(context, subId)) {
+            return isGsmBasicOptions(context, subId);
+        }
+
         final int networkMode = getNetworkTypeFromRaf(
                 (int) telephonyManager.getAllowedNetworkTypesForReason(
                         TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_USER));
-        if (networkMode == TelephonyManagerConstants.NETWORK_MODE_LTE_CDMA_EVDO
-                && isWorldMode(context, subId)) {
+        if (networkMode == TelephonyManagerConstants.NETWORK_MODE_LTE_CDMA_EVDO) {
             return false;
         }
         if (shouldSpeciallyUpdateGsmCdma(context, subId)) {
@@ -483,10 +486,8 @@ public class MobileNetworkUtils {
             return true;
         }
 
-        if (isWorldMode(context, subId)) {
-            if (networkMode == TelephonyManagerConstants.NETWORK_MODE_LTE_GSM_WCDMA) {
-                return true;
-            }
+        if (networkMode == TelephonyManagerConstants.NETWORK_MODE_LTE_GSM_WCDMA) {
+            return true;
         }
 
         return false;