Merge CAF branch 'LA.BR.1.2.1_rb2.19' into caf/cm-12.0.caf/cm-12.0

5 files changed, 73 insertions, 5 deletions

diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 752305485..dadf83309 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -534,6 +534,9 @@
     <string name="network_message" msgid="4483886461245213802">"网络讯息"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"激活您的手机"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"需要拨打特别号码才能激活您的手机服务。\n\n在按下“激活”后，按照语音提示激活您的手机。"</string>
+    <string name="managed_roaming_title">"漫游托管"</string>
+    <string name="managed_roaming_title_sub">"漫游托管 （卡<xliff:g id="index" example="1">%d</xliff:g>）"</string>
+    <string name="managed_roaming_dialog_content">"网络服务受限，确认搜索网络？"</string>
     <string name="ota_hfa_activation_title" msgid="2234246934160473981">"正在激活…"</string>
     <string name="ota_hfa_activation_dialog_message" msgid="8092479227918463415">"手机正在激活您的移动数据网络服务。\n\n此过程最多5分钟就能完成。"</string>
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"略过激活步骤？"</string>
@@ -667,4 +670,10 @@
     <string name="xdivert_title">X-Divert设置</string>
     <string name="xdivert_summary">CFNRc设置</string>
     <string name="network_forbidden">(禁用)</string>
+
+    <!-- Carrier Name -->
+    <string name="China_Mobile">中国移动</string>
+    <string name="China_Unicom">中国联通</string>
+    <string name="China_Telecom">中国电信</string>
+    <string name="roamingTextSearching">"正在搜索服务"</string>
 </resources>
diff --git a/res/values/array.xml b/res/values/array.xml
index d937b893c..a293948a0 100644
--- a/res/values/array.xml
+++ b/res/values/array.xml
@@ -94,4 +94,30 @@
         <item>@string/time_formate_pm</item>
     </string-array>
     <!-- Array resource for call fowarding timer settings-->
+
+    <string-array name="original_carrier_names" translateable="false">
+        <item>CHINA\u0020\u0020MOBILE</item>
+        <item>CHN-UNICOM</item>
+        <item>China Mobile</item>
+        <item>China Unicom</item>
+        <item>China Telecom</item>
+        <item>中国移动</item>
+        <item>中国联通</item>
+        <item>中国电信</item>
+        <item>CMCC</item>
+        <item>Searching for Service</item>
+    </string-array>
+
+    <string-array name="locale_carrier_names" translatable="false">
+        <item>China_Mobile</item>
+        <item>China_Unicom</item>
+        <item>China_Mobile</item>
+        <item>China_Unicom</item>
+        <item>China_Telecom</item>
+        <item>China_Mobile</item>
+        <item>China_Unicom</item>
+        <item>China_Telecom</item>
+        <item>China_Mobile</item>
+        <item>roamingTextSearching</item>
+    </string-array>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 58c74215b..2826a03d0 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1672,4 +1672,9 @@
     <string name="sum_preferred_networks"></string>
     <string name="network_forbidden">(Forbidden)</string>
 
+    <!-- Carrier Name -->
+    <string name="China_Mobile">China Mobile</string>
+    <string name="China_Unicom">China Unicom</string>
+    <string name="China_Telecom">China Telecom</string>
+    <string name="roamingTextSearching">Searching for Service</string>
 </resources>
diff --git a/src/com/android/phone/NetworkSetting.java b/src/com/android/phone/NetworkSetting.java
index 357e38e4a..2dbdc4972 100644
--- a/src/com/android/phone/NetworkSetting.java
+++ b/src/com/android/phone/NetworkSetting.java
@@ -528,9 +528,15 @@ public class NetworkSetting extends PreferenceActivity
         String title;
 
         if (!TextUtils.isEmpty(ni.getOperatorAlphaLong())) {
-            title = ni.getOperatorAlphaLong();
+            title = android.util.NativeTextHelper.getInternalLocalString(this,
+                    ni.getOperatorAlphaLong(),
+                    R.array.original_carrier_names,
+                    R.array.locale_carrier_names);
         } else if (!TextUtils.isEmpty(ni.getOperatorAlphaShort())) {
-            title = ni.getOperatorAlphaShort();
+            title = android.util.NativeTextHelper.getInternalLocalString(this,
+                    ni.getOperatorAlphaShort(),
+                    R.array.original_carrier_names,
+                    R.array.locale_carrier_names);
         } else {
             title = ni.getOperatorNumeric();
         }
diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index e4c62cd63..aed32bbb4 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -1635,9 +1635,31 @@ public class PhoneInterfaceManager extends ITelephony.Stub {
      */
     public String getIccOperatorNumeric(long subId) {
         String iccOperatorNumeric = null;
-        IccRecords iccRecords = getPhone(subId).getIccCard().getIccRecords();
-        if (iccRecords != null) {
-            iccOperatorNumeric = iccRecords.getOperatorNumeric();
+        int netType = getPhone(subId).getServiceState().getRilDataRadioTechnology();
+        int family = UiccController.getFamilyFromRadioTechnology(netType);
+        if (family == UiccController.APP_FAM_UNKNOWN) {
+            int phoneType = getActivePhoneTypeForSubscriber(subId);
+            switch (phoneType) {
+                case TelephonyManager.PHONE_TYPE_GSM:
+                    family = UiccController.APP_FAM_3GPP;
+                    break;
+                case TelephonyManager.PHONE_TYPE_CDMA:
+                    family = UiccController.APP_FAM_3GPP2;
+                    break;
+            }
+        }
+
+        if (family != UiccController.APP_FAM_UNKNOWN) {
+            int slotId = SubscriptionManager.getPhoneId(subId);
+            IccRecords iccRecords = UiccController.getInstance().getIccRecords(slotId, family);
+            if (iccRecords != null) {
+                iccOperatorNumeric = iccRecords.getOperatorNumeric();
+            }
+        } else {
+            IccRecords iccRecords = getPhone(subId).getIccCard().getIccRecords();
+            if (iccRecords != null) {
+                iccOperatorNumeric = iccRecords.getOperatorNumeric();
+            }
         }
         return iccOperatorNumeric;
     }