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

Commit e9e7b1ee authored by Gyanesh Mittal's avatar Gyanesh Mittal Committed by Automerger Merge Worker
Browse files

Merge "Update KEY_CARRIER_SERVICE_NUMBER_STRING_ARRAY documentation to reflect... 

Merge "Update KEY_CARRIER_SERVICE_NUMBER_STRING_ARRAY documentation to reflect new requirement for Service dialing number." into main am: 2cfbb911

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



Change-Id: I6112cb6e1e0a583caaa57e3c908308c8a6aaac5f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cd1e400c 2cfbb911

telephony/java/android/telephony/CarrierConfigManager.java

+8 −8
Original line number Diff line number Diff line
@@ -4601,12 +4601,12 @@ public class CarrierConfigManager { 
     *

     * <p>Example:

     *

     * <pre><code>

     * <pre>{@code

     * <string-array name="carrier_service_name_array" num="2">

     *   <item value="Police"/>

     *   <item value="Ambulance"/>

     * </string-array>

     * </code></pre>

     * }</pre>

     */

    public static final String KEY_CARRIER_SERVICE_NAME_STRING_ARRAY = "carrier_service_name_array";
@@ -4620,18 +4620,18 @@ public class CarrierConfigManager { 
     *

     * <ul>

     *   <li>The number of items in both the arrays are equal

     *   <li>The item added in this key follows a specific format. Either it should be all numbers,

     *       or "+" followed by all numbers.

     *   <li>The item should contain dialable characters only which includes 0-9, -, *, #, (, ),

     *       SPACE.

     * </ul>

     *

     * <p>Example:

     *

     * <pre><code>

     * <pre>{@code

     * <string-array name="carrier_service_number_array" num="2">

     *   <item value="123"/>

     *   <item value="+343"/>

     *   <item value="*123"/>

     *   <item value="+ (111) 111-111"/>

     * </string-array>

     * </code></pre>

     * }</pre>

     */

    public static final String KEY_CARRIER_SERVICE_NUMBER_STRING_ARRAY =

        "carrier_service_number_array";