From bdedfc06ad027d3e54f8b3f93e3e98123a238183 Mon Sep 17 00:00:00 2001 From: SongFerngWang Date: Tue, 16 Jun 2020 18:39:35 +0800 Subject: [PATCH] Add a carrier config for WFC's carrier name override by ef_pnn To override wifi calling's carrier name string using ef_pnn from sim card. Bug: 157108864 Test: UE with TMO sim card to test in Roaming and WFC on, and then check operator name. (PASS) Change-Id: Id72ce2a9a0fb8f45efa8a975e8052808f726a971 Merged-In: Id72ce2a9a0fb8f45efa8a975e8052808f726a971 --- .../java/android/telephony/CarrierConfigManager.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index 0690a90a98081..7180e11ea0ce5 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -1404,6 +1404,14 @@ public class CarrierConfigManager { */ public static final String KEY_CARRIER_NAME_STRING = "carrier_name_string"; + /** + * To override wifi calling's carrier name string using ef_pnn from sim card when SPN in empty. + * + * @hide + */ + public static final String KEY_WFC_CARRIER_NAME_OVERRIDE_BY_PNN_BOOL = + "wfc_carrier_name_override_by_pnn_bool"; + /** * Override the SPN Display Condition 2 integer bits (lsb). B2, B1 is the last two bits of the * spn display condition coding. @@ -3960,6 +3968,7 @@ public class CarrierConfigManager { sDefaults.putBoolean(KEY_CONFIG_WIFI_DISABLE_IN_ECBM, false); sDefaults.putBoolean(KEY_CARRIER_NAME_OVERRIDE_BOOL, false); sDefaults.putString(KEY_CARRIER_NAME_STRING, ""); + sDefaults.putBoolean(KEY_WFC_CARRIER_NAME_OVERRIDE_BY_PNN_BOOL, false); sDefaults.putInt(KEY_SPN_DISPLAY_CONDITION_OVERRIDE_INT, -1); sDefaults.putStringArray(KEY_SPDI_OVERRIDE_STRING_ARRAY, null); sDefaults.putStringArray(KEY_PNN_OVERRIDE_STRING_ARRAY, null);