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

Merge "Remove CALL_COMPOSER_STATUS_ON_NO_PICTURES" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-03-03 02:00:41 +00:00
committed by Android (Google) Code Review
parent 8bd914610f a7b68ad877
commit a5f26eb3f5
2 changed files with 5 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/api/current.txt
View File

@@ -42234,7 +42234,6 @@ 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

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

@@ -9129,18 +9129,11 @@ 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 {}
@@ -9148,9 +9141,8 @@ 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 any of {@link #CALL_COMPOSER_STATUS_ON}
* {@link #CALL_COMPOSER_STATUS_OFF},
* or {@link #CALL_COMPOSER_STATUS_ON_NO_PICTURES}
* 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
* given subId. Otherwise, applies to {@link SubscriptionManager#getDefaultSubscriptionId()}
@@ -9160,7 +9152,7 @@ public class TelephonyManager {
*/
@RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)
public void setCallComposerStatus(@CallComposerStatus int status) {
if (status > CALL_COMPOSER_STATUS_ON_NO_PICTURES
if (status > CALL_COMPOSER_STATUS_ON
|| status < CALL_COMPOSER_STATUS_OFF) {
throw new IllegalArgumentException("requested status is invalid");
}
@@ -9183,9 +9175,8 @@ public class TelephonyManager {
*
* @throws SecurityException if the caller does not have the permission.
*
* @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}.
* @return the user-set status for enriched calling with call composer, either of
* {@link #CALL_COMPOSER_STATUS_ON} or {@link #CALL_COMPOSER_STATUS_OFF}.
*/
@RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
public @CallComposerStatus int getCallComposerStatus() {