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

Commit 303060c9 authored by Hall Liu's avatar Hall Liu
Browse files

Move some of the call-forwarding related constants 

Move the call forwarding result constants into
CallForwardingInfoCallback and rename them to RESULT_*

Fixes: 169153246
Test: atest TelephonyManagerTest
Change-Id: I14b4d527807e92fe977b8304f8dd95e7cd93e819
parent b9e67709

api/system-current.txt

+5 −5
Original line number Diff line number Diff line
@@ -10718,16 +10718,12 @@ package android.telephony { 
    method public int getTimeoutSeconds();

    method public boolean isEnabled();

    field @NonNull public static final android.os.Parcelable.Creator<android.telephony.CallForwardingInfo> CREATOR;

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

    field public static final int ERROR_NOT_SUPPORTED = 3; // 0x3

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

    field public static final int REASON_ALL = 4; // 0x4

    field public static final int REASON_ALL_CONDITIONAL = 5; // 0x5

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

    field public static final int REASON_NOT_REACHABLE = 3; // 0x3

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

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

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

  }















  public final class CallQuality implements android.os.Parcelable {










@@ -11470,7 +11466,7 @@ package android.telephony {













    method @Deprecated @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public int setAllowedCarriers(int, java.util.List<android.service.carrier.CarrierIdentifier>);















    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setAllowedNetworkTypes(long);















    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setCallForwarding(@NonNull android.telephony.CallForwardingInfo, @Nullable java.util.concurrent.Executor, @Nullable java.util.function.Consumer<java.lang.Integer>);













    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setCallWaitingStatus(boolean, @Nullable java.util.concurrent.Executor, @Nullable java.util.function.Consumer<java.lang.Integer>);













    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setCallWaitingEnabled(boolean, @Nullable java.util.concurrent.Executor, @Nullable java.util.function.Consumer<java.lang.Integer>);















    method @Deprecated @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setCarrierDataEnabled(boolean);















    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public int setCarrierRestrictionRules(@NonNull android.telephony.CarrierRestrictionRules);















    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDataActivationState(int);










@@ -11569,6 +11565,10 @@ package android.telephony {













  public static interface TelephonyManager.CallForwardingInfoCallback {















    method public void onCallForwardingInfoAvailable(@NonNull android.telephony.CallForwardingInfo);















    method public void onError(int);













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













    field public static final int RESULT_ERROR_NOT_SUPPORTED = 3; // 0x3













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













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















  }





























  public final class UiccAccessRule implements android.os.Parcelable {

























non-updatable-api/system-current.txt



+5
−5




























Original line number
Diff line number
Diff line








@@ -9580,16 +9580,12 @@ package android.telephony {













    method public int getTimeoutSeconds();















    method public boolean isEnabled();















    field @NonNull public static final android.os.Parcelable.Creator<android.telephony.CallForwardingInfo> CREATOR;













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













    field public static final int ERROR_NOT_SUPPORTED = 3; // 0x3













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















    field public static final int REASON_ALL = 4; // 0x4















    field public static final int REASON_ALL_CONDITIONAL = 5; // 0x5















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















    field public static final int REASON_NOT_REACHABLE = 3; // 0x3















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















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













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















  }





























  public final class CallQuality implements android.os.Parcelable {










@@ -10332,7 +10328,7 @@ package android.telephony {













    method @Deprecated @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public int setAllowedCarriers(int, java.util.List<android.service.carrier.CarrierIdentifier>);















    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setAllowedNetworkTypes(long);















    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setCallForwarding(@NonNull android.telephony.CallForwardingInfo, @Nullable java.util.concurrent.Executor, @Nullable java.util.function.Consumer<java.lang.Integer>);













    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setCallWaitingStatus(boolean, @Nullable java.util.concurrent.Executor, @Nullable java.util.function.Consumer<java.lang.Integer>);













    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setCallWaitingEnabled(boolean, @Nullable java.util.concurrent.Executor, @Nullable java.util.function.Consumer<java.lang.Integer>);















    method @Deprecated @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setCarrierDataEnabled(boolean);















    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public int setCarrierRestrictionRules(@NonNull android.telephony.CarrierRestrictionRules);















    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDataActivationState(int);










@@ -10431,6 +10427,10 @@ package android.telephony {













  public static interface TelephonyManager.CallForwardingInfoCallback {















    method public void onCallForwardingInfoAvailable(@NonNull android.telephony.CallForwardingInfo);















    method public void onError(int);













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













    field public static final int RESULT_ERROR_NOT_SUPPORTED = 3; // 0x3













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













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















  }





























  public final class UiccAccessRule implements android.os.Parcelable {

























telephony/api/system-current.txt



+5
−5




























Original line number
Diff line number
Diff line








@@ -35,16 +35,12 @@ package android.telephony {













    method public int getTimeoutSeconds();















    method public boolean isEnabled();















    field @NonNull public static final android.os.Parcelable.Creator<android.telephony.CallForwardingInfo> CREATOR;













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













    field public static final int ERROR_NOT_SUPPORTED = 3; // 0x3













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















    field public static final int REASON_ALL = 4; // 0x4















    field public static final int REASON_ALL_CONDITIONAL = 5; // 0x5















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















    field public static final int REASON_NOT_REACHABLE = 3; // 0x3















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















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













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















  }































  public final class CallQuality implements android.os.Parcelable {










@@ -755,7 +751,7 @@ package android.telephony {













    method @Deprecated @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public int setAllowedCarriers(int, java.util.List<android.service.carrier.CarrierIdentifier>);















    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setAllowedNetworkTypes(long);















    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setCallForwarding(@NonNull android.telephony.CallForwardingInfo, @Nullable java.util.concurrent.Executor, @Nullable java.util.function.Consumer<java.lang.Integer>);













    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setCallWaitingStatus(boolean, @Nullable java.util.concurrent.Executor, @Nullable java.util.function.Consumer<java.lang.Integer>);













    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setCallWaitingEnabled(boolean, @Nullable java.util.concurrent.Executor, @Nullable java.util.function.Consumer<java.lang.Integer>);















    method @Deprecated @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setCarrierDataEnabled(boolean);















    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public int setCarrierRestrictionRules(@NonNull android.telephony.CarrierRestrictionRules);















    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDataActivationState(int);










@@ -854,6 +850,10 @@ package android.telephony {













  public static interface TelephonyManager.CallForwardingInfoCallback {















    method public void onCallForwardingInfoAvailable(@NonNull android.telephony.CallForwardingInfo);















    method public void onError(int);













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













    field public static final int RESULT_ERROR_NOT_SUPPORTED = 3; // 0x3













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













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















  }































  public final class UiccAccessRule implements android.os.Parcelable {

































telephony/java/android/telephony/CallForwardingInfo.java



+0
−34




























Original line number
Diff line number
Diff line








@@ -38,27 +38,6 @@ import java.util.Objects;













public final class CallForwardingInfo implements Parcelable {















    private static final String TAG = "CallForwardingInfo";





























    /**













     * Indicates that the operation was successful.













     */













    public static final int SUCCESS = 0;



























    /**













     * Indicates that setting or retrieving the call forwarding info failed with an unknown error.













     */













    public static final int ERROR_UNKNOWN = 1;



























    /**













     * Indicates that call forwarding is not enabled because the recipient is not on a













     * Fixed Dialing Number (FDN) list.













     */













    public static final int ERROR_FDN_CHECK_FAILURE = 2;



























    /**













     * Indicates that call forwarding is not supported on the network at this time.













     */













    public static final int ERROR_NOT_SUPPORTED = 3;





























    /**















     * Indicates that call forwarding reason is "unconditional".















     * Reference: 3GPP TS 27.007 version 10.3.0 Release 10 - 7.11 Call forwarding number










@@ -103,19 +82,6 @@ public final class CallForwardingInfo implements Parcelable {













     */















    public static final int REASON_ALL_CONDITIONAL = 5;





























    /**













     * Call forwarding errors













     * @hide













     */













    @IntDef(prefix = { "ERROR_" }, value = {













            ERROR_UNKNOWN,













            ERROR_NOT_SUPPORTED,













            ERROR_FDN_CHECK_FAILURE













    })













    @Retention(RetentionPolicy.SOURCE)













    public @interface CallForwardingError{













    }





























    /**















     * Call forwarding reason types















     * @hide

































telephony/java/android/telephony/TelephonyManager.java



+41
−6




























Original line number
Diff line number
Diff line








@@ -13027,6 +13027,40 @@ public class TelephonyManager {













     */















    @SystemApi















    public interface CallForwardingInfoCallback {













        /**













         * Indicates that the operation was successful.













         */













        int RESULT_SUCCESS = 0;

























        /**













         * Indicates that setting or retrieving the call forwarding info failed with an unknown













         * error.













         */













        int RESULT_ERROR_UNKNOWN = 1;

























        /**













         * Indicates that call forwarding is not enabled because the recipient is not on a













         * Fixed Dialing Number (FDN) list.













         */













        int RESULT_ERROR_FDN_CHECK_FAILURE = 2;

























        /**













         * Indicates that call forwarding is not supported on the network at this time.













         */













        int RESULT_ERROR_NOT_SUPPORTED = 3;

























        /**













         * Call forwarding errors













         * @hide













         */













        @IntDef(prefix = { "RESULT_ERROR_" }, value = {













                RESULT_ERROR_UNKNOWN,













                RESULT_ERROR_NOT_SUPPORTED,













                RESULT_ERROR_FDN_CHECK_FAILURE













        })













        @Retention(RetentionPolicy.SOURCE)













        @interface CallForwardingError{













        }















        /**















         * Called when the call forwarding info is successfully retrieved from the network.















         * @param info information about how calls are forwarded









@@ -13037,7 +13071,7 @@ public class TelephonyManager {













         * Called when there was an error retrieving the call forwarding information.















         * @param error















         */













        void onError(@CallForwardingInfo.CallForwardingError int error);













        void onError(@CallForwardingError int error);















    }





























    /**










@@ -13110,9 +13144,9 @@ public class TelephonyManager {













     * @param executor The executor on which the listener will be called. Must be non-null if















     *                 {@code listener} is non-null.















     * @param resultListener Asynchronous listener that'll be called when the operation completes.













     *                      Called with {@link CallForwardingInfo#SUCCESS} if the operation













     *                      succeeded and an error code from {@link CallForwardingInfo}













     *                      if it failed.













     *                      Called with {@link CallForwardingInfoCallback#RESULT_SUCCESS} if the













     *                      operation succeeded and an error code from













     *                      {@link CallForwardingInfoCallback} it failed.















     *















     * @throws IllegalArgumentException if any of the following are true for the parameter















     * callForwardingInfo:









@@ -13138,7 +13172,8 @@ public class TelephonyManager {













    @SystemApi















    public void setCallForwarding(@NonNull CallForwardingInfo callForwardingInfo,















            @Nullable @CallbackExecutor Executor executor,













            @Nullable @CallForwardingInfo.CallForwardingError Consumer<Integer> resultListener) {













            @Nullable @CallForwardingInfoCallback.CallForwardingError













                    Consumer<Integer> resultListener) {















        if (callForwardingInfo == null) {















            throw new IllegalArgumentException("callForwardingInfo is null");















        }










@@ -13294,7 +13329,7 @@ public class TelephonyManager {













     */















    @SystemApi















    @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)













    public void setCallWaitingStatus(boolean enabled, @Nullable Executor executor,













    public void setCallWaitingEnabled(boolean enabled, @Nullable Executor executor,















            @Nullable Consumer<Integer> resultListener) {















        if (resultListener != null) {















            Objects.requireNonNull(executor);