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

Commit 9a1365f4 authored by Shuo Qian's avatar Shuo Qian Committed by Automerger Merge Worker
Browse files

Merge "Add Call Composer API extras in TelecomManager" am: 6e419a49 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I01c845221406e973de92b3d31bc7e2ee0a4fb9fc
parents a36986be 6e419a49

core/api/current.txt

+7 −0
Original line number Diff line number Diff line
@@ -39030,14 +39030,19 @@ package android.telecom { 
    field public static final String EXTRA_DEFAULT_CALL_SCREENING_APP_COMPONENT_NAME = "android.telecom.extra.DEFAULT_CALL_SCREENING_APP_COMPONENT_NAME";

    field public static final String EXTRA_DISCONNECT_CAUSE = "android.telecom.extra.DISCONNECT_CAUSE";

    field public static final String EXTRA_HANDLE = "android.telecom.extra.HANDLE";

    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";

    field public static final String EXTRA_NOTIFICATION_COUNT = "android.telecom.extra.NOTIFICATION_COUNT";

    field public static final String EXTRA_NOTIFICATION_PHONE_NUMBER = "android.telecom.extra.NOTIFICATION_PHONE_NUMBER";

    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_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";

    field public static final String EXTRA_START_CALL_WITH_VIDEO_STATE = "android.telecom.extra.START_CALL_WITH_VIDEO_STATE";
@@ -39053,6 +39058,8 @@ package android.telecom { 
    field public static final int PRESENTATION_PAYPHONE = 4; // 0x4

    field public static final int PRESENTATION_RESTRICTED = 2; // 0x2

    field public static final int PRESENTATION_UNKNOWN = 3; // 0x3

    field public static final int PRIORITY_NORMAL = 0; // 0x0

    field public static final int PRIORITY_URGENT = 1; // 0x1

  }















  public class VideoProfile implements android.os.Parcelable {

























telecomm/java/android/telecom/TelecomManager.java



+60
−1




























Original line number
Diff line number
Diff line








@@ -266,10 +266,69 @@ public class TelecomManager {













    /**















     * Optional extra for {@link android.content.Intent#ACTION_CALL} containing a string call















     * subject which will be associated with an outgoing call.  Should only be specified if the













     * {@link PhoneAccount} supports the capability {@link PhoneAccount#CAPABILITY_CALL_SUBJECT}.













     * {@link PhoneAccount} supports the capability {@link PhoneAccount#CAPABILITY_CALL_SUBJECT}













     * or {@link PhoneAccount#CAPABILITY_CALL_COMPOSER}.















     */















    public static final String EXTRA_CALL_SUBJECT = "android.telecom.extra.CALL_SUBJECT";





























    // Values for EXTRA_PRIORITY













    /**













     * Indicates the call composer call priority is normal.













     *













     * Reference: RCC.20 Section 2.4.4.2













     */













    public static final int PRIORITY_NORMAL = 0;



























    /**













     * Indicates the call composer call priority is urgent.













     *













     * Reference: RCC.20 Section 2.4.4.2













     */













    public static final int PRIORITY_URGENT = 1;



























    /**













     * Extra for the call composer call priority, either {@link #PRIORITY_NORMAL} or













     * {@link #PRIORITY_URGENT}.













     *













     * Reference: RCC.20 Section 2.4.4.2













     */













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



























    /**













     * Extra for the call composer call location, an {@link android.location.Location} parcelable













     * class to represent the geolocation as a latitude and longitude pair.













     *













     * Reference: RCC.20 Section 2.4.3.2













     */













    public static final String EXTRA_LOCATION = "android.telecom.extra.LOCATION";



























    /**













     * A boolean extra set on incoming calls to indicate that the call has a picture specified.













     * Given that image download could take a (short) time, the EXTRA is set immediately upon













     * adding the call to the Dialer app, this allows the Dialer app to reserve space for an image













     * if one is expected. The EXTRA may be unset if the image download ends up failing for some













     * reason.













     */













    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.













     * 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













     * {@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";



























    // TODO(hallliu), This UUID is obtained from TelephonyManager#uploadCallComposerPicture.













    /**













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













     * being placed.













     */













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





























    /**















     * The extra used by a {@link ConnectionService} to provide the handle of the caller that















     * has initiated a new incoming call.