Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Support call composer status that disabled the picture sending"

Browse Source
This commit is contained in:
Shuo Qian
2021-01-14 20:49:43 +00:00
committed by Gerrit Code Review
parent fe962c3a7b 5321bad867
commit f1273df6cc
2 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/api/current.txt
View File

@@ -41149,6 +41149,7 @@ package android.telephony {
field public static final int AUTHTYPE_EAP_SIM = 128; // 0x80 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_OFF = 0; // 0x0
field public static final int CALL_COMPOSER_STATUS_ON = 1; // 0x1 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_IDLE = 0; // 0x0
field public static final int CALL_STATE_OFFHOOK = 2; // 0x2 field public static final int CALL_STATE_OFFHOOK = 2; // 0x2
field public static final int CALL_STATE_RINGING = 1; // 0x1 field public static final int CALL_STATE_RINGING = 1; // 0x1

20
telephony/java/android/telephony/TelephonyManager.java
View File

@@ -8689,11 +8689,18 @@ public class TelephonyManager {
*/ */
public static final int CALL_COMPOSER_STATUS_ON = 1; 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 */ /** @hide */
@IntDef(prefix = {"CALL_COMPOSER_STATUS_"}, @IntDef(prefix = {"CALL_COMPOSER_STATUS_"},
value = { value = {
CALL_COMPOSER_STATUS_ON, CALL_COMPOSER_STATUS_ON,
CALL_COMPOSER_STATUS_OFF, CALL_COMPOSER_STATUS_OFF,
CALL_COMPOSER_STATUS_ON_NO_PICTURES,
}) })
public @interface CallComposerStatus {} public @interface CallComposerStatus {}
@@ -8701,8 +8708,9 @@ 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 a value of either {@link #CALL_COMPOSER_STATUS_ON} * it must be any of {@link #CALL_COMPOSER_STATUS_ON}
* or {@link #CALL_COMPOSER_STATUS_OFF}. * {@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 * <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()}
@@ -8712,7 +8720,8 @@ public class TelephonyManager {
*/ */
@RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)
public void setCallComposerStatus(@CallComposerStatus int status) { 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"); throw new IllegalArgumentException("requested status is invalid");
} }
try { try {
@@ -8734,8 +8743,9 @@ public class TelephonyManager {
* *
* @throws SecurityException if the caller does not have the permission. * @throws SecurityException if the caller does not have the permission.
* *
* @return the user-set status for enriched calling with call composer either * @return the user-set status for enriched calling with call composer, any of
* {@link #CALL_COMPOSER_STATUS_ON} or {@link #CALL_COMPOSER_STATUS_OFF}. * {@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) @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
public @CallComposerStatus int getCallComposerStatus() { public @CallComposerStatus int getCallComposerStatus() {