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

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

Merge changes from topic "composer-final-integration" into sc-dev am: 0fdcbb8c 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifba492f298da3aa1994cd53c9e75efe128df9b98
parents 1138d7c1 0fdcbb8c

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -39715,7 +39715,6 @@ package android.telecom { 
    field public static final String EXTRA_HAS_PICTURE = "android.telecom.extra.HAS_PICTURE";

    field public static final String EXTRA_INCOMING_CALL_ADDRESS = "android.telecom.extra.INCOMING_CALL_ADDRESS";

    field public static final String EXTRA_INCOMING_CALL_EXTRAS = "android.telecom.extra.INCOMING_CALL_EXTRAS";

    field public static final String EXTRA_INCOMING_PICTURE = "android.telecom.extra.INCOMING_PICTURE";

    field public static final String EXTRA_INCOMING_VIDEO_STATE = "android.telecom.extra.INCOMING_VIDEO_STATE";

    field public static final String EXTRA_IS_DEFAULT_CALL_SCREENING_APP = "android.telecom.extra.IS_DEFAULT_CALL_SCREENING_APP";

    field public static final String EXTRA_LOCATION = "android.telecom.extra.LOCATION";
@@ -39724,6 +39723,7 @@ package android.telecom { 
    field public static final String EXTRA_OUTGOING_CALL_EXTRAS = "android.telecom.extra.OUTGOING_CALL_EXTRAS";

    field public static final String EXTRA_OUTGOING_PICTURE = "android.telecom.extra.OUTGOING_PICTURE";

    field public static final String EXTRA_PHONE_ACCOUNT_HANDLE = "android.telecom.extra.PHONE_ACCOUNT_HANDLE";

    field public static final String EXTRA_PICTURE_URI = "android.telecom.extra.PICTURE_URI";

    field public static final String EXTRA_PRIORITY = "android.telecom.extra.PRIORITY";

    field public static final String EXTRA_START_CALL_WITH_RTT = "android.telecom.extra.START_CALL_WITH_RTT";

    field public static final String EXTRA_START_CALL_WITH_SPEAKERPHONE = "android.telecom.extra.START_CALL_WITH_SPEAKERPHONE";

telecomm/java/android/telecom/TelecomManager.java

+5 −3
Original line number Diff line number Diff line
@@ -314,15 +314,17 @@ public class TelecomManager { 
    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.

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

     * when a call is placed.

     *

     * 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

     * download is delayed for some reason. The Dialer app will receive a callback via

     * download/upload is delayed for some reason. The Dialer app will receive a callback via

     * {@link Call.Callback#onDetailsChanged} when this value has changed.

     *

     * Reference: RCC.20 Section 2.4.3.2

     */

    public static final String EXTRA_INCOMING_PICTURE = "android.telecom.extra.INCOMING_PICTURE";

    public static final String EXTRA_PICTURE_URI = "android.telecom.extra.PICTURE_URI";



    /**

     * A ParcelUuid used as a token to represent a picture that was uploaded prior to the call