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

Merge "Call waiting add the error reponse for FDN_CHECK_FAILURE"

Browse Source
This commit is contained in:
SongFerng Wang
2022-01-20 16:54:35 +00:00
committed by Android (Google) Code Review
parent 218e713d6f 79eca48b7b
commit 24672908c5
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/api/system-current.txt
View File

@@ -13001,6 +13001,7 @@ package android.telephony {
field public static final int ALLOWED_NETWORK_TYPES_REASON_USER = 0; // 0x0
field public static final int CALL_WAITING_STATUS_DISABLED = 2; // 0x2
field public static final int CALL_WAITING_STATUS_ENABLED = 1; // 0x1
field public static final int CALL_WAITING_STATUS_FDN_CHECK_FAILURE = 5; // 0x5
field public static final int CALL_WAITING_STATUS_NOT_SUPPORTED = 4; // 0x4
field public static final int CALL_WAITING_STATUS_UNKNOWN_ERROR = 3; // 0x3
field public static final String CAPABILITY_NR_DUAL_CONNECTIVITY_CONFIGURATION_AVAILABLE = "CAPABILITY_NR_DUAL_CONNECTIVITY_CONFIGURATION_AVAILABLE";

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

@@ -15137,6 +15137,15 @@ public class TelephonyManager {
@SystemApi
public static final int CALL_WAITING_STATUS_NOT_SUPPORTED = 4;
/**
* Indicates the call waiting status could not be set or queried because the Fixed Dialing
* Numbers (FDN) feature is enabled.
*
* @hide
*/
@SystemApi
public static final int CALL_WAITING_STATUS_FDN_CHECK_FAILURE = 5;
/**
* @hide
*/
@@ -15145,6 +15154,7 @@ public class TelephonyManager {
CALL_WAITING_STATUS_DISABLED,
CALL_WAITING_STATUS_UNKNOWN_ERROR,
CALL_WAITING_STATUS_NOT_SUPPORTED,
CALL_WAITING_STATUS_FDN_CHECK_FAILURE,
})
@Retention(RetentionPolicy.SOURCE)
public @interface CallWaitingStatus {
@@ -15165,6 +15175,7 @@ public class TelephonyManager {
* <li>{@link #CALL_WAITING_STATUS_DISABLED}}</li>
* <li>{@link #CALL_WAITING_STATUS_UNKNOWN_ERROR}}</li>
* <li>{@link #CALL_WAITING_STATUS_NOT_SUPPORTED}}</li>
* <li>{@link #CALL_WAITING_STATUS_FDN_CHECK_FAILURE}}</li>
* </ul>
* @hide
*/
@@ -15214,7 +15225,8 @@ public class TelephonyManager {
* {@link #CALL_WAITING_STATUS_ENABLED} or
* {@link #CALL_WAITING_STATUS_DISABLED} if the operation succeeded and
* {@link #CALL_WAITING_STATUS_NOT_SUPPORTED} or
* {@link #CALL_WAITING_STATUS_UNKNOWN_ERROR} if it failed.
* {@link #CALL_WAITING_STATUS_UNKNOWN_ERROR} or
* {@link #CALL_WAITING_STATUS_FDN_CHECK_FAILURE} if it failed.
* @hide
*/
@SystemApi