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

Commit 12e0aff4 authored by Shuo Qian's avatar Shuo Qian Committed by Automerger Merge Worker
Browse files

Merge "Support call composer status that disabled the picture sending" am:... 

Merge "Support call composer status that disabled the picture sending" am: f1273df6 am: b5abba46 am: e6b7513c

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib8d89c2aeef56cd555e78f92e77d3d7be6996c09
parents 87ea68b2 e6b7513c

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -41891,6 +41891,7 @@ package android.telephony { 
    field public static final int AUTHTYPE_EAP_SIM = 128; // 0x80

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

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

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

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

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

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

telephony/java/android/telephony/TelephonyManager.java

+15 −5
Original line number Diff line number Diff line
@@ -9045,11 +9045,18 @@ public class TelephonyManager { 
     */

    public static final int CALL_COMPOSER_STATUS_ON = 1;













    /**













     * Call composer status indicating that sending/receiving pictures is disabled.













     * All other attachments are still enabled in this state.













     */













    public static final int CALL_COMPOSER_STATUS_ON_NO_PICTURES = 2;



























    /** @hide */















    @IntDef(prefix = {"CALL_COMPOSER_STATUS_"},















            value = {















                CALL_COMPOSER_STATUS_ON,















                CALL_COMPOSER_STATUS_OFF,













                CALL_COMPOSER_STATUS_ON_NO_PICTURES,















            })















    public @interface CallComposerStatus {}























@@ -9057,8 +9064,9 @@ public class TelephonyManager {













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















     *















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













     *               it must be a value of either {@link #CALL_COMPOSER_STATUS_ON}













     *               or {@link #CALL_COMPOSER_STATUS_OFF}.













     *               it must be any of {@link #CALL_COMPOSER_STATUS_ON}













     *               {@link #CALL_COMPOSER_STATUS_OFF},













     *               or {@link #CALL_COMPOSER_STATUS_ON_NO_PICTURES}















     *















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















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









@@ -9068,7 +9076,8 @@ public class TelephonyManager {













     */















    @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)















    public void setCallComposerStatus(@CallComposerStatus int status) {













        if (status != CALL_COMPOSER_STATUS_ON && status != CALL_COMPOSER_STATUS_OFF) {













        if (status > CALL_COMPOSER_STATUS_ON_NO_PICTURES













                || status < CALL_COMPOSER_STATUS_OFF) {















            throw new IllegalArgumentException("requested status is invalid");















        }















        try {









@@ -9090,8 +9099,9 @@ public class TelephonyManager {













     *















     * @throws SecurityException if the caller does not have the permission.















     *













     * @return the user-set status for enriched calling with call composer either













     * {@link #CALL_COMPOSER_STATUS_ON} or {@link #CALL_COMPOSER_STATUS_OFF}.













     * @return the user-set status for enriched calling with call composer, any of













     * {@link #CALL_COMPOSER_STATUS_ON}, {@link #CALL_COMPOSER_STATUS_OFF}, or













     * {@link #CALL_COMPOSER_STATUS_ON_NO_PICTURES}.















     */















    @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)















    public @CallComposerStatus int getCallComposerStatus() {