diff options
author | 2023-03-14 16:17:04 +0000 | |
---|---|---|
committer | 2023-03-14 16:17:04 +0000 | |
commit | 31e01215911f29eaac5fb50e244bbf8fa765a419 (patch) | |
tree | 0fb224492c4860eda5ac410562816c12c5a119f0 | |
parent | ffe3d2239ec52c5620cd596f5d8ed166f1d3df8a (diff) | |
parent | 2e81eed57d459fb632be35a7eefbb02af41a0153 (diff) |
Merge "Add new SPN format for "WiFi Call"." into udc-dev
-rw-r--r-- | core/res/res/values/strings.xml | 3 | ||||
-rw-r--r-- | telephony/java/android/telephony/CarrierConfigManager.java | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index 307490665080..d8e69d748324 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -327,6 +327,7 @@ <item>@string/wfcSpnFormat_wifi_calling_wo_hyphen</item> <item>@string/wfcSpnFormat_vowifi</item> <item>@string/wfcSpnFormat_spn_wifi_calling_vo_hyphen</item> + <item>@string/wfcSpnFormat_wifi_call</item> </string-array> <!-- Spn during Wi-Fi Calling: "<operator>" --> @@ -353,6 +354,8 @@ <string name="wfcSpnFormat_wifi_calling_wo_hyphen">WiFi Calling</string> <!-- Spn during Wi-Fi Calling: "VoWifi" --> <string name="wfcSpnFormat_vowifi">VoWifi</string> + <!-- Spn during Wi_Fi Calling: "WiFi Call" (without hyphen). This string is shown in the call banner for calls which take place over a WiFi network. --> + <string name="wfcSpnFormat_wifi_call">WiFi Call</string> <!-- WFC, summary for Disabled --> <string name="wifi_calling_off_summary">Off</string> diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index bf12b9cce302..d334d171f0ff 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -1628,6 +1628,7 @@ public class CarrierConfigManager { * <li> 9: WiFi Calling</li> * <li> 10: VoWifi</li> * <li> 11: %s WiFi Calling</li> + * <li> 12: WiFi Call</li> * @hide */ public static final String KEY_WFC_SPN_FORMAT_IDX_INT = "wfc_spn_format_idx_int"; |