diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-03-08 11:25:59 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-03-08 11:25:59 +0000 |
| commit | 6acfb8cc608522e1e6e15b281a4a77a3d2d012d1 (patch) | |
| tree | 3c41fb6b7f858cc93db40420c560f326cb92d160 | |
| parent | 724e12b6ea04b0edad3bfbad89d71d2f68d63736 (diff) | |
| parent | b920bf45fdf312818a08ebd842ca23b5a234a156 (diff) | |
Snap for 9706159 from b920bf45fdf312818a08ebd842ca23b5a234a156 to t-keystone-qcom-release
Change-Id: I8662ecc8d82da43cadde80d00b440fa48854fc8d
| -rw-r--r-- | src/com/android/settings/network/telephony/DomesticRoamUtils.java | 48 |
1 files changed, 46 insertions, 2 deletions
diff --git a/src/com/android/settings/network/telephony/DomesticRoamUtils.java b/src/com/android/settings/network/telephony/DomesticRoamUtils.java index afa40407ad..d84303f9d3 100644 --- a/src/com/android/settings/network/telephony/DomesticRoamUtils.java +++ b/src/com/android/settings/network/telephony/DomesticRoamUtils.java @@ -61,9 +61,53 @@ public class DomesticRoamUtils { Log.d(TAG, "getMPLMNOperatorName: context = " + context
+ " subId = " + subId + " idMPLMN = " + idMPLMN);
}
+
+ if (TextUtils.isEmpty(idMPLMN)) {
+ return EMPTY_OPERATOR_NAME;
+ }
+
Context appContext = context.getApplicationContext();
- OPERATOR_TYPE homeOperator = getHomeOperatorType(appContext, subId);
- OPERATOR_TYPE mplmnOperator = getMPLMNOperatorType(appContext, subId, idMPLMN);
+
+ // use the static mapping to generate the operator name for MPLMN select UI
+ OPERATOR_TYPE homeOperator = OPERATOR_TYPE.OTHERS;
+ OPERATOR_TYPE mplmnOperator = OPERATOR_TYPE.OTHERS;
+ switch (idMPLMN) {
+ case "46050":
+ homeOperator = OPERATOR_TYPE.CHINA_MOBILE;
+ mplmnOperator = OPERATOR_TYPE.CHINA_TELECOM;
+ break;
+ case "46051":
+ homeOperator = OPERATOR_TYPE.CHINA_BROADCAST;
+ mplmnOperator = OPERATOR_TYPE.CHINA_TELECOM;
+ break;
+ case "46021":
+ homeOperator = OPERATOR_TYPE.CHINA_TELECOM;
+ mplmnOperator = OPERATOR_TYPE.CHINA_MOBILE;
+ break;
+ case "46022":
+ homeOperator = OPERATOR_TYPE.CHINA_UNION;
+ mplmnOperator = OPERATOR_TYPE.CHINA_MOBILE;
+ break;
+ case "46031":
+ homeOperator = OPERATOR_TYPE.CHINA_MOBILE;
+ mplmnOperator = OPERATOR_TYPE.CHINA_UNION;
+ break;
+ case "46032":
+ homeOperator = OPERATOR_TYPE.CHINA_BROADCAST;
+ mplmnOperator = OPERATOR_TYPE.CHINA_UNION;
+ break;
+ case "46060":
+ homeOperator = OPERATOR_TYPE.CHINA_TELECOM;
+ mplmnOperator = OPERATOR_TYPE.CHINA_BROADCAST;
+ break;
+ case "46061":
+ homeOperator = OPERATOR_TYPE.CHINA_UNION;
+ mplmnOperator = OPERATOR_TYPE.CHINA_BROADCAST;
+ break;
+ default:
+ break;
+ }
+
Log.d(TAG, "getMPLMNOperatorName: homeOperator = " + homeOperator
+ " mplmnOperator = " + mplmnOperator);
if (homeOperator == OPERATOR_TYPE.OTHERS
|