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

Commit 24672908 authored by SongFerng Wang's avatar SongFerng Wang Committed by Android (Google) Code Review
Browse files

Merge "Call waiting add the error reponse for FDN_CHECK_FAILURE"

parents 218e713d 79eca48b

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -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";

telephony/java/android/telephony/TelephonyManager.java

+13 −1
Original line number Diff line number Diff line
@@ -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