Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Format incoming call numbers with the national format for Japan" am: 1b637fe165

Browse Source 
Change-Id: I5cfcb157650b14f26f3493447afc2943327cdd15
This commit is contained in:
Automerger Merge Worker
2020-02-28 16:01:54 +00:00
parent 2381378392 1b637fe165
commit a1a9acbedc
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
telephony/java/android/telephony/CarrierConfigManager.java
View File

@@ -3457,6 +3457,15 @@ public class CarrierConfigManager {
public static final String KEY_CARRIER_CERTIFICATE_STRING_ARRAY = public static final String KEY_CARRIER_CERTIFICATE_STRING_ARRAY =
"carrier_certificate_string_array"; "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.
* e.g. "+819012345678" -> "09012345678"
* @hide
*/
public static final String KEY_FORMAT_INCOMING_NUMBER_TO_NATIONAL_FOR_JP_BOOL =
"format_incoming_number_to_national_for_jp_bool";
/** /**
* DisconnectCause array to play busy tone. Value should be array of * DisconnectCause array to play busy tone. Value should be array of
* {@link android.telephony.DisconnectCause}. * {@link android.telephony.DisconnectCause}.
@@ -3983,6 +3992,7 @@ public class CarrierConfigManager {
sDefaults.putBoolean(KEY_SUPPORT_WPS_OVER_IMS_BOOL, true); sDefaults.putBoolean(KEY_SUPPORT_WPS_OVER_IMS_BOOL, true);
sDefaults.putAll(Ims.getDefaults()); sDefaults.putAll(Ims.getDefaults());
sDefaults.putStringArray(KEY_CARRIER_CERTIFICATE_STRING_ARRAY, null); sDefaults.putStringArray(KEY_CARRIER_CERTIFICATE_STRING_ARRAY, null);
sDefaults.putBoolean(KEY_FORMAT_INCOMING_NUMBER_TO_NATIONAL_FOR_JP_BOOL, false);
sDefaults.putIntArray(KEY_DISCONNECT_CAUSE_PLAY_BUSYTONE_INT_ARRAY, sDefaults.putIntArray(KEY_DISCONNECT_CAUSE_PLAY_BUSYTONE_INT_ARRAY,
new int[] {4 /* BUSY */}); new int[] {4 /* BUSY */});
sDefaults.putBoolean(KEY_PREVENT_CLIR_ACTIVATION_AND_DEACTIVATION_CODE_BOOL, false); sDefaults.putBoolean(KEY_PREVENT_CLIR_ACTIVATION_AND_DEACTIVATION_CODE_BOOL, false);