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

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

Merge "Clarify number format expectations for get/setPhoneNumber" am: af4fc5fb 

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

Change-Id: Ie8ae7dc0d60ca635a5d189e3f47f9a24fa309e17
parents a1dd80e0 af4fc5fb

telephony/java/android/telephony/SubscriptionManager.java

+13 −0
Original line number Original line Diff line number Diff line
@@ -3820,6 +3820,11 @@ public class SubscriptionManager { 
     * {@link #PHONE_NUMBER_SOURCE_UICC UICC} and decide if the previously set phone number

     * {@link #PHONE_NUMBER_SOURCE_UICC UICC} and decide if the previously set phone number

     * of source {@link #PHONE_NUMBER_SOURCE_CARRIER carrier} should be updated.

     * of source {@link #PHONE_NUMBER_SOURCE_CARRIER carrier} should be updated.

     *

     *

     * <p>The API provides no guarantees of what format the number is in: the format can vary

     * depending on the {@code source} and the network etc. Programmatic parsing should be done

     * cautiously, for example, after formatting the number to a consistent format with

     * {@link android.telephony.PhoneNumberUtils#formatNumberToE164(String, String)}.

     *

     * <p>Note the assumption is that one subscription (which usually means one SIM) has

     * <p>Note the assumption is that one subscription (which usually means one SIM) has

     * only one phone number. The multiple sources backup each other so hopefully at least one

     * only one phone number. The multiple sources backup each other so hopefully at least one

     * is availavle. For example, for a carrier that doesn't typically set phone numbers

     * is availavle. For example, for a carrier that doesn't typically set phone numbers
@@ -3878,6 +3883,11 @@ public class SubscriptionManager { 
     * from available sources in the following order: {@link #PHONE_NUMBER_SOURCE_CARRIER}

     * from available sources in the following order: {@link #PHONE_NUMBER_SOURCE_CARRIER}

     * > {@link #PHONE_NUMBER_SOURCE_UICC} > {@link #PHONE_NUMBER_SOURCE_IMS}.

     * > {@link #PHONE_NUMBER_SOURCE_UICC} > {@link #PHONE_NUMBER_SOURCE_IMS}.

     *

     *

     * <p>The API provides no guarantees of what format the number is in: the format can vary

     * depending on the underlying source and the network etc. Programmatic parsing should be done

     * cautiously, for example, after formatting the number to a consistent format with

     * {@link android.telephony.PhoneNumberUtils#formatNumberToE164(String, String)}.

     *

     * @param subscriptionId the subscription ID, or {@link #DEFAULT_SUBSCRIPTION_ID}

     * @param subscriptionId the subscription ID, or {@link #DEFAULT_SUBSCRIPTION_ID}

     *                       for the default one.

     *                       for the default one.

     * @return the phone number, or an empty string if not available.

     * @return the phone number, or an empty string if not available.
@@ -3916,6 +3926,9 @@ public class SubscriptionManager { 
     * <p>The API is suitable for carrier apps to provide a phone number, for example when

     * <p>The API is suitable for carrier apps to provide a phone number, for example when

     * it's not possible to update {@link #PHONE_NUMBER_SOURCE_UICC UICC} directly.

     * it's not possible to update {@link #PHONE_NUMBER_SOURCE_UICC UICC} directly.

     *

     *

     * <p>It's recommended that the phone number is formatted to well-known formats,

     * for example, by {@link PhoneNumberUtils} {@code formatNumber*} methods.

     *

     * @param subscriptionId the subscription ID, or {@link #DEFAULT_SUBSCRIPTION_ID}

     * @param subscriptionId the subscription ID, or {@link #DEFAULT_SUBSCRIPTION_ID}

     *                       for the default one.

     *                       for the default one.

     * @param number the phone number, or an empty string to remove the previously set number.

     * @param number the phone number, or an empty string to remove the previously set number.