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

Commit 5f3ca706 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 am: 1d606903

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



Change-Id: I4aa957c38a4d1d60f3daab483b80b7de4bcc94d7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 43306ab4 1d606903

telephony/java/android/telephony/CarrierConfigManager.java

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

     */