From 7fd6185b0e24dbda49a811309653967fa805b805 Mon Sep 17 00:00:00 2001 From: Shohei Kikkawa Date: Fri, 3 Jun 2022 17:57:59 +0900 Subject: [PATCH] Format conference participant phone numbers to national for Japan Add feature to "format_incoming_number_to_national_for_jp_bool". This CC has control whether the incoming numbers and the conference call participant phone numbers should be formatted to national number. Test: manual Bug: 232027335 Change-Id: Ica5dab38c19ccb269ca219bc6893169c33af12f4 --- telephony/java/android/telephony/CarrierConfigManager.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index 8956b4652f66d..4c2db901ab9bf 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -5525,8 +5525,9 @@ public class CarrierConfigManager { "carrier_certificate_string_array"; /** - * Flag specifying whether the incoming call number should be formatted to national number - * for Japan. @return {@code true} convert to the national format, {@code false} otherwise. + * Flag specifying whether the incoming call number and the conference participant number + * should be formatted to national number for Japan. + * @return {@code true} convert to the national format, {@code false} otherwise. * e.g. "+819012345678" -> "09012345678" * @hide */ @@ -6429,7 +6430,7 @@ public class CarrierConfigManager { sDefaults.putAll(Ims.getDefaults()); sDefaults.putAll(Iwlan.getDefaults()); sDefaults.putStringArray(KEY_CARRIER_CERTIFICATE_STRING_ARRAY, new String[0]); - sDefaults.putBoolean(KEY_FORMAT_INCOMING_NUMBER_TO_NATIONAL_FOR_JP_BOOL, false); + sDefaults.putBoolean(KEY_FORMAT_INCOMING_NUMBER_TO_NATIONAL_FOR_JP_BOOL, false); sDefaults.putIntArray(KEY_DISCONNECT_CAUSE_PLAY_BUSYTONE_INT_ARRAY, new int[] {4 /* BUSY */}); sDefaults.putBoolean(KEY_PREVENT_CLIR_ACTIVATION_AND_DEACTIVATION_CODE_BOOL, false);