From 3148dd89feb89477010cd389250c16273bae7d3b Mon Sep 17 00:00:00 2001 From: Bonian Chen Date: Fri, 15 Oct 2021 17:42:14 +0800 Subject: [PATCH] [Settings] Refactor MobileNetworkUtils Code refactor MobileNetworkUtils - Access CarrierConfig API prior to Telephony API Bug: 201757298 Test: presubmit pass Change-Id: I657949a6735a27c9c4e7706bdfa236e722cabec5 --- .../settings/network/telephony/MobileNetworkUtils.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/com/android/settings/network/telephony/MobileNetworkUtils.java b/src/com/android/settings/network/telephony/MobileNetworkUtils.java index 9049a2a300f..da1ddfa7afd 100644 --- a/src/com/android/settings/network/telephony/MobileNetworkUtils.java +++ b/src/com/android/settings/network/telephony/MobileNetworkUtils.java @@ -508,12 +508,15 @@ public class MobileNetworkUtils { if (carrierConfig.getBoolean(CarrierConfigManager.KEY_SUPPORT_TDSCDMA_BOOL)) { return true; } + final String[] numericArray = carrierConfig.getStringArray( + CarrierConfigManager.KEY_SUPPORT_TDSCDMA_ROAMING_NETWORKS_STRING_ARRAY); + if (numericArray == null) { + return false; + } final ServiceState serviceState = telephonyManager.getServiceState(); final String operatorNumeric = (serviceState != null) ? serviceState.getOperatorNumeric() : null; - final String[] numericArray = carrierConfig.getStringArray( - CarrierConfigManager.KEY_SUPPORT_TDSCDMA_ROAMING_NETWORKS_STRING_ARRAY); - if (numericArray == null || operatorNumeric == null) { + if (operatorNumeric == null) { return false; } for (String numeric : numericArray) {