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

Merge "Format conference participant phone numbers to national for Japan" am: 52cdf7372d

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2147099

Change-Id: I130f968eb5ec9d5357fc461cba1cddf20faefd9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-02-07 23:08:59 +00:00
committed by Automerger Merge Worker
parent f6d244fe65 52cdf7372d
commit 3cfcaaf5f2
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8265,8 +8265,9 @@ public class CarrierConfigManager {
"carrier_certificate_string_array"; "carrier_certificate_string_array";
/** /**
* Flag specifying whether the incoming call number should be formatted to national number * Flag specifying whether the incoming call number and the conference participant number
* for Japan. @return {@code true} convert to the national format, {@code false} otherwise. * should be formatted to national number for Japan.
* @return {@code true} convert to the national format, {@code false} otherwise.
* e.g. "+819012345678" -> "09012345678" * e.g. "+819012345678" -> "09012345678"
* @hide * @hide
*/ */
@@ -9197,7 +9198,7 @@ public class CarrierConfigManager {
sDefaults.putAll(Bsf.getDefaults()); sDefaults.putAll(Bsf.getDefaults());
sDefaults.putAll(Iwlan.getDefaults()); sDefaults.putAll(Iwlan.getDefaults());
sDefaults.putStringArray(KEY_CARRIER_CERTIFICATE_STRING_ARRAY, new String[0]); 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, 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);