Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1d606903 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

Merge "Format conference participant phone numbers to national for Japan" am: 52cdf737 am: 3cfcaaf5

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



Change-Id: I71d35466be57dac426cbe9f668252e5cd68a6349
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 546ca64a 3cfcaaf5

telephony/java/android/telephony/CarrierConfigManager.java

+4 −3
Original line number Diff line number Diff line
@@ -8265,8 +8265,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

     */