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

Commit d5bfc89c authored by Hall Liu's avatar Hall Liu Committed by Automerger Merge Worker
Browse files

Merge "Clarify semantics in call composer extras" into sc-dev am: c22a3780 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icbeda99b1106859960dd47b96e05686a9600bc0d
parents d5fe5e8e c22a3780

telecomm/java/android/telecom/TelecomManager.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -314,8 +314,8 @@ public class TelecomManager { 
    public static final String EXTRA_HAS_PICTURE = "android.telecom.extra.HAS_PICTURE";

    public static final String EXTRA_HAS_PICTURE = "android.telecom.extra.HAS_PICTURE";





    /**

    /**

     * A URI representing the picture that was downloaded when a call is received or uploaded

     * A {@link Uri} representing the picture that was downloaded when a call is received or

     * when a call is placed.

     * uploaded when a call is placed.

     *

     *

     * This is a content URI within the call log provider which can be used to open a file

     * This is a content URI within the call log provider which can be used to open a file

     * descriptor. This could be set a short time after a call is added to the Dialer app if the

     * descriptor. This could be set a short time after a call is added to the Dialer app if the

telephony/java/android/telephony/TelephonyManager.java

+1 −3
Original line number Original line Diff line number Diff line
@@ -9135,9 +9135,7 @@ public class TelephonyManager { 
    /**

    /**

     * Set the user-set status for enriched calling with call composer.

     * Set the user-set status for enriched calling with call composer.

     *

     *

     * @param status user-set status for enriched calling with call composer;

     * @param status user-set status for enriched calling with call composer.

     *               it must be either {@link #CALL_COMPOSER_STATUS_ON} or

     *               {@link #CALL_COMPOSER_STATUS_OFF}.

     *

     *

     * <p>If this object has been created with {@link #createForSubscriptionId}, applies to the

     * <p>If this object has been created with {@link #createForSubscriptionId}, applies to the

     * given subId. Otherwise, applies to {@link SubscriptionManager#getDefaultSubscriptionId()}

     * given subId. Otherwise, applies to {@link SubscriptionManager#getDefaultSubscriptionId()}

telephony/java/android/telephony/ims/ImsCallProfile.java

+8 −0
Original line number Original line Diff line number Diff line
@@ -277,6 +277,10 @@ public final class ImsCallProfile implements Parcelable { 
     * server infrastructure to get the picture. It can be set via

     * server infrastructure to get the picture. It can be set via

     * {@link #setCallExtra(String, String)}.

     * {@link #setCallExtra(String, String)}.

     *

     *

     * Note that this URL is not intended to be parsed by the IMS stack -- it should be sent

     * directly to the network for consumption by the called party or forwarded directly from the

     * network to the platform for caching and download.

     *

     * Reference: RCC.20 Section 2.4.3.2

     * Reference: RCC.20 Section 2.4.3.2

     */

     */

    public static final String EXTRA_PICTURE_URL = "android.telephony.ims.extra.PICTURE_URL";

    public static final String EXTRA_PICTURE_URL = "android.telephony.ims.extra.PICTURE_URL";
@@ -729,6 +733,10 @@ public final class ImsCallProfile implements Parcelable { 




    /**

    /**

     * Set the call extra value (Parcelable), given the call extra name.

     * Set the call extra value (Parcelable), given the call extra name.

     *

     * Note that the {@link Parcelable} provided must be a class defined in the Android API surface,

     * as opposed to a class defined by your app.

     *

     * @param name call extra name

     * @param name call extra name

     * @param parcelable call extra value

     * @param parcelable call extra value

     */

     */