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

Commit af7d2858 authored by Hall Liu's avatar Hall Liu Committed by Automerger Merge Worker
Browse files

Expose and update the call forward/waiting APIs am: 8410239d am: 84a9653e 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1471162

Change-Id: I97a2186c08d2cbbcc8f4111c6f7abdd60b2bf1de
parents dacbfa7e 84a9653e

api/system-current.txt

+33 −0
Original line number Diff line number Diff line
@@ -10543,6 +10543,26 @@ package android.telephony { 
    field @NonNull public static final android.os.Parcelable.Creator<android.telephony.CallAttributes> CREATOR;

  }













  public final class CallForwardingInfo implements android.os.Parcelable {













    ctor public CallForwardingInfo(boolean, int, @Nullable String, int);













    method public int describeContents();













    method @Nullable public String getNumber();













    method public int getReason();













    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 {















    ctor public CallQuality(int, int, int, int, int, int, int, int, int, int, int);















    ctor public CallQuality(int, int, int, int, int, int, int, int, int, int, int, boolean, boolean, boolean);










@@ -11184,6 +11204,8 @@ package android.telephony {













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















    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public long getAllowedNetworkTypes();















    method @Nullable @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS) public android.content.ComponentName getAndUpdateDefaultRespondViaMessageApplication();













    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void getCallForwarding(int, @NonNull java.util.concurrent.Executor, @NonNull android.telephony.TelephonyManager.CallForwardingInfoCallback);













    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void getCallWaitingStatus(@NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Integer>);















    method @Nullable @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public android.telephony.ImsiEncryptionInfo getCarrierInfoForImsiEncryption(int);















    method public java.util.List<java.lang.String> getCarrierPackageNamesForIntent(android.content.Intent);















    method public java.util.List<java.lang.String> getCarrierPackageNamesForIntentAndPhone(android.content.Intent, int);










@@ -11262,6 +11284,8 @@ package android.telephony {













    method @RequiresPermission(android.Manifest.permission.CONNECTIVITY_INTERNAL) public void resetSettings();















    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 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);










@@ -11300,6 +11324,10 @@ package android.telephony {













    field public static final String ACTION_SIM_APPLICATION_STATE_CHANGED = "android.telephony.action.SIM_APPLICATION_STATE_CHANGED";















    field public static final String ACTION_SIM_CARD_STATE_CHANGED = "android.telephony.action.SIM_CARD_STATE_CHANGED";















    field public static final String ACTION_SIM_SLOT_STATUS_CHANGED = "android.telephony.action.SIM_SLOT_STATUS_CHANGED";













    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_NOT_SUPPORTED = 4; // 0x4













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















    field public static final int CARRIER_PRIVILEGE_STATUS_ERROR_LOADING_RULES = -2; // 0xfffffffe















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















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










@@ -11356,6 +11384,11 @@ package android.telephony {













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















  }



























  public static interface TelephonyManager.CallForwardingInfoCallback {













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













    method public void onError(int);













  }



























  public final class UiccAccessRule implements android.os.Parcelable {















    ctor public UiccAccessRule(byte[], @Nullable String, long);















    method public int describeContents();

























non-updatable-api/system-current.txt



+33
−0




























Original line number
Diff line number
Diff line








@@ -9425,6 +9425,26 @@ package android.telephony {













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















  }



























  public final class CallForwardingInfo implements android.os.Parcelable {













    ctor public CallForwardingInfo(boolean, int, @Nullable String, int);













    method public int describeContents();













    method @Nullable public String getNumber();













    method public int getReason();













    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 {















    ctor public CallQuality(int, int, int, int, int, int, int, int, int, int, int);















    ctor public CallQuality(int, int, int, int, int, int, int, int, int, int, int, boolean, boolean, boolean);










@@ -10066,6 +10086,8 @@ package android.telephony {













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















    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public long getAllowedNetworkTypes();















    method @Nullable @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS) public android.content.ComponentName getAndUpdateDefaultRespondViaMessageApplication();













    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void getCallForwarding(int, @NonNull java.util.concurrent.Executor, @NonNull android.telephony.TelephonyManager.CallForwardingInfoCallback);













    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void getCallWaitingStatus(@NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Integer>);















    method @Nullable @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public android.telephony.ImsiEncryptionInfo getCarrierInfoForImsiEncryption(int);















    method public java.util.List<java.lang.String> getCarrierPackageNamesForIntent(android.content.Intent);















    method public java.util.List<java.lang.String> getCarrierPackageNamesForIntentAndPhone(android.content.Intent, int);










@@ -10144,6 +10166,8 @@ package android.telephony {













    method @RequiresPermission(android.Manifest.permission.CONNECTIVITY_INTERNAL) public void resetSettings();















    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 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);










@@ -10182,6 +10206,10 @@ package android.telephony {













    field public static final String ACTION_SIM_APPLICATION_STATE_CHANGED = "android.telephony.action.SIM_APPLICATION_STATE_CHANGED";















    field public static final String ACTION_SIM_CARD_STATE_CHANGED = "android.telephony.action.SIM_CARD_STATE_CHANGED";















    field public static final String ACTION_SIM_SLOT_STATUS_CHANGED = "android.telephony.action.SIM_SLOT_STATUS_CHANGED";













    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_NOT_SUPPORTED = 4; // 0x4













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















    field public static final int CARRIER_PRIVILEGE_STATUS_ERROR_LOADING_RULES = -2; // 0xfffffffe















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















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










@@ -10238,6 +10266,11 @@ package android.telephony {













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















  }



























  public static interface TelephonyManager.CallForwardingInfoCallback {













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













    method public void onError(int);













  }



























  public final class UiccAccessRule implements android.os.Parcelable {















    ctor public UiccAccessRule(byte[], @Nullable String, long);















    method public int describeContents();

























telephony/api/system-current.txt



+33
−0




























Original line number
Diff line number
Diff line








@@ -27,6 +27,26 @@ package android.telephony {













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















  }





























  public final class CallForwardingInfo implements android.os.Parcelable {













    ctor public CallForwardingInfo(boolean, int, @Nullable String, int);













    method public int describeContents();













    method @Nullable public String getNumber();













    method public int getReason();













    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 {















    ctor public CallQuality(int, int, int, int, int, int, int, int, int, int, int);















    ctor public CallQuality(int, int, int, int, int, int, int, int, int, int, int, boolean, boolean, boolean);










@@ -640,6 +660,8 @@ package android.telephony {













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















    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public long getAllowedNetworkTypes();















    method @Nullable @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS) public android.content.ComponentName getAndUpdateDefaultRespondViaMessageApplication();













    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void getCallForwarding(int, @NonNull java.util.concurrent.Executor, @NonNull android.telephony.TelephonyManager.CallForwardingInfoCallback);













    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void getCallWaitingStatus(@NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Integer>);















    method @Nullable @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public android.telephony.ImsiEncryptionInfo getCarrierInfoForImsiEncryption(int);















    method public java.util.List<java.lang.String> getCarrierPackageNamesForIntent(android.content.Intent);















    method public java.util.List<java.lang.String> getCarrierPackageNamesForIntentAndPhone(android.content.Intent, int);










@@ -719,6 +741,8 @@ 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 setCarrierDataEnabled(boolean);













    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 int setCarrierRestrictionRules(@NonNull android.telephony.CarrierRestrictionRules);















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















    method @Deprecated @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDataEnabled(int, boolean);










@@ -756,6 +780,10 @@ package android.telephony {













    field public static final String ACTION_SIM_APPLICATION_STATE_CHANGED = "android.telephony.action.SIM_APPLICATION_STATE_CHANGED";















    field public static final String ACTION_SIM_CARD_STATE_CHANGED = "android.telephony.action.SIM_CARD_STATE_CHANGED";















    field public static final String ACTION_SIM_SLOT_STATUS_CHANGED = "android.telephony.action.SIM_SLOT_STATUS_CHANGED";













    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_NOT_SUPPORTED = 4; // 0x4













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















    field public static final int CARRIER_PRIVILEGE_STATUS_ERROR_LOADING_RULES = -2; // 0xfffffffe















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















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










@@ -812,6 +840,11 @@ package android.telephony {













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















  }





























  public static interface TelephonyManager.CallForwardingInfoCallback {













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













    method public void onError(int);













  }





























  public final class UiccAccessRule implements android.os.Parcelable {















    ctor public UiccAccessRule(byte[], @Nullable String, long);















    method public int describeContents();

































telephony/java/android/telephony/CallForwardingInfo.java



+39
−66


























File changed.
Preview size limit exceeded, changes collapsed.
























telephony/java/android/telephony/TelephonyManager.java



+189
−78


























File changed.
Preview size limit exceeded, changes collapsed.