diff options
8 files changed, 63 insertions, 268 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index b7d0e5ff3b94..ab5be31aceaf 100755 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -10348,19 +10348,7 @@ package android.telephony.ims { } public class ImsRcsManager implements android.telephony.ims.RegistrationManager { - method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void getRegistrationState(@NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Integer>); - method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void getRegistrationTransportType(@NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Integer>); - method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isAvailable(int) throws android.telephony.ims.ImsException; - method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isCapable(int, int) throws android.telephony.ims.ImsException; - method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void registerImsRegistrationCallback(@NonNull java.util.concurrent.Executor, @NonNull android.telephony.ims.RegistrationManager.RegistrationCallback) throws android.telephony.ims.ImsException; - method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void registerRcsAvailabilityCallback(@NonNull java.util.concurrent.Executor, @NonNull android.telephony.ims.ImsRcsManager.AvailabilityCallback) throws android.telephony.ims.ImsException; - method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void unregisterImsRegistrationCallback(@NonNull android.telephony.ims.RegistrationManager.RegistrationCallback); - method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void unregisterRcsAvailabilityCallback(@NonNull android.telephony.ims.ImsRcsManager.AvailabilityCallback) throws android.telephony.ims.ImsException; - } - - public static class ImsRcsManager.AvailabilityCallback { - ctor public ImsRcsManager.AvailabilityCallback(); - method public void onAvailabilityChanged(@NonNull android.telephony.ims.feature.RcsFeature.RcsImsCapabilities); + method @NonNull public android.telephony.ims.RcsUceAdapter getUceAdapter(); } public final class ImsReasonInfo implements android.os.Parcelable { @@ -10739,34 +10727,8 @@ package android.telephony.ims { } public class RcsUceAdapter { - method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public int getUcePublishState() throws android.telephony.ims.ImsException; method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isUceSettingEnabled() throws android.telephony.ims.ImsException; - method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void requestCapabilities(@NonNull java.util.concurrent.Executor, @NonNull java.util.List<android.net.Uri>, @NonNull android.telephony.ims.RcsUceAdapter.CapabilitiesCallback) throws android.telephony.ims.ImsException; method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setUceSettingEnabled(boolean) throws android.telephony.ims.ImsException; - field public static final int ERROR_ALREADY_IN_QUEUE = 13; // 0xd - field public static final int ERROR_FORBIDDEN = 6; // 0x6 - field public static final int ERROR_GENERIC_FAILURE = 1; // 0x1 - field public static final int ERROR_INSUFFICIENT_MEMORY = 11; // 0xb - field public static final int ERROR_LOST_NETWORK = 12; // 0xc - field public static final int ERROR_NOT_AUTHORIZED = 5; // 0x5 - field public static final int ERROR_NOT_AVAILABLE = 3; // 0x3 - field public static final int ERROR_NOT_ENABLED = 2; // 0x2 - field public static final int ERROR_NOT_FOUND = 7; // 0x7 - field public static final int ERROR_NOT_REGISTERED = 4; // 0x4 - field public static final int ERROR_REQUEST_TIMEOUT = 10; // 0xa - field public static final int ERROR_REQUEST_TOO_LARGE = 8; // 0x8 - field public static final int PUBLISH_STATE_200_OK = 1; // 0x1 - field public static final int PUBLISH_STATE_NOT_PUBLISHED = 2; // 0x2 - field public static final int PUBLISH_STATE_OTHER_ERROR = 6; // 0x6 - field public static final int PUBLISH_STATE_RCS_PROVISION_ERROR = 4; // 0x4 - field public static final int PUBLISH_STATE_REQUEST_TIMEOUT = 5; // 0x5 - field public static final int PUBLISH_STATE_VOLTE_PROVISION_ERROR = 3; // 0x3 - } - - public static class RcsUceAdapter.CapabilitiesCallback { - ctor public RcsUceAdapter.CapabilitiesCallback(); - method public void onCapabilitiesReceived(@NonNull java.util.List<android.telephony.ims.RcsContactUceCapability>); - method public void onError(int); } } @@ -10858,23 +10820,8 @@ package android.telephony.ims.feature { public class RcsFeature extends android.telephony.ims.feature.ImsFeature { ctor public RcsFeature(); method public void changeEnabledCapabilities(@NonNull android.telephony.ims.feature.CapabilityChangeRequest, @NonNull android.telephony.ims.feature.ImsFeature.CapabilityCallbackProxy); - method @NonNull public android.telephony.ims.stub.RcsSipOptionsImplBase getOptionsExchangeImpl(); - method @NonNull public android.telephony.ims.stub.RcsPresenceExchangeImplBase getPresenceExchangeImpl(); - method public final void notifyCapabilitiesStatusChanged(@NonNull android.telephony.ims.feature.RcsFeature.RcsImsCapabilities); method public void onFeatureReady(); method public void onFeatureRemoved(); - method public boolean queryCapabilityConfiguration(int, int); - method @NonNull public final android.telephony.ims.feature.RcsFeature.RcsImsCapabilities queryCapabilityStatus(); - } - - public static class RcsFeature.RcsImsCapabilities extends android.telephony.ims.feature.ImsFeature.Capabilities { - ctor public RcsFeature.RcsImsCapabilities(int); - method public void addCapabilities(int); - method public boolean isCapable(int); - method public void removeCapabilities(int); - field public static final int CAPABILITY_TYPE_NONE = 0; // 0x0 - field public static final int CAPABILITY_TYPE_OPTIONS_UCE = 1; // 0x1 - field public static final int CAPABILITY_TYPE_PRESENCE_UCE = 2; // 0x2 } } @@ -11052,71 +10999,6 @@ package android.telephony.ims.stub { field public static final int INVALID_RESULT = -1; // 0xffffffff } - public class RcsCapabilityExchange { - ctor public RcsCapabilityExchange(); - method public final void onCommandUpdate(int, int) throws android.telephony.ims.ImsException; - field public static final int COMMAND_CODE_FETCH_ERROR = 4; // 0x4 - field public static final int COMMAND_CODE_GENERIC_FAILURE = 2; // 0x2 - field public static final int COMMAND_CODE_INSUFFICIENT_MEMORY = 6; // 0x6 - field public static final int COMMAND_CODE_INVALID_PARAM = 3; // 0x3 - field public static final int COMMAND_CODE_LOST_NETWORK_CONNECTION = 7; // 0x7 - field public static final int COMMAND_CODE_NOT_FOUND = 9; // 0x9 - field public static final int COMMAND_CODE_NOT_SUPPORTED = 8; // 0x8 - field public static final int COMMAND_CODE_NO_CHANGE_IN_CAP = 11; // 0xb - field public static final int COMMAND_CODE_REQUEST_TIMEOUT = 5; // 0x5 - field public static final int COMMAND_CODE_SERVICE_UNAVAILABLE = 10; // 0xa - field public static final int COMMAND_CODE_SERVICE_UNKNOWN = 0; // 0x0 - field public static final int COMMAND_CODE_SUCCESS = 1; // 0x1 - } - - public class RcsPresenceExchangeImplBase extends android.telephony.ims.stub.RcsCapabilityExchange { - ctor public RcsPresenceExchangeImplBase(); - method public final void onCapabilityRequestResponse(@NonNull java.util.List<android.telephony.ims.RcsContactUceCapability>, int) throws android.telephony.ims.ImsException; - method public final void onNetworkResponse(int, @NonNull String, int) throws android.telephony.ims.ImsException; - method public final void onNotifyUpdateCapabilites(int) throws android.telephony.ims.ImsException; - method public final void onUnpublish() throws android.telephony.ims.ImsException; - method public void requestCapabilities(@NonNull java.util.List<android.net.Uri>, int); - method public void updateCapabilities(@NonNull android.telephony.ims.RcsContactUceCapability, int); - field public static final int CAPABILITY_UPDATE_TRIGGER_ETAG_EXPIRED = 0; // 0x0 - field public static final int CAPABILITY_UPDATE_TRIGGER_MOVE_TO_2G = 6; // 0x6 - field public static final int CAPABILITY_UPDATE_TRIGGER_MOVE_TO_3G = 5; // 0x5 - field public static final int CAPABILITY_UPDATE_TRIGGER_MOVE_TO_EHRPD = 3; // 0x3 - field public static final int CAPABILITY_UPDATE_TRIGGER_MOVE_TO_HSPAPLUS = 4; // 0x4 - field public static final int CAPABILITY_UPDATE_TRIGGER_MOVE_TO_IWLAN = 8; // 0x8 - field public static final int CAPABILITY_UPDATE_TRIGGER_MOVE_TO_LTE_VOPS_DISABLED = 1; // 0x1 - field public static final int CAPABILITY_UPDATE_TRIGGER_MOVE_TO_LTE_VOPS_ENABLED = 2; // 0x2 - field public static final int CAPABILITY_UPDATE_TRIGGER_MOVE_TO_NR5G_VOPS_DISABLED = 10; // 0xa - field public static final int CAPABILITY_UPDATE_TRIGGER_MOVE_TO_NR5G_VOPS_ENABLED = 11; // 0xb - field public static final int CAPABILITY_UPDATE_TRIGGER_MOVE_TO_WLAN = 7; // 0x7 - field public static final int CAPABILITY_UPDATE_TRIGGER_UNKNOWN = 9; // 0x9 - field public static final int RESPONSE_FORBIDDEN = 3; // 0x3 - field public static final int RESPONSE_NOT_AUTHORIZED_FOR_PRESENCE = 2; // 0x2 - field public static final int RESPONSE_NOT_FOUND = 4; // 0x4 - field public static final int RESPONSE_NOT_REGISTERED = 1; // 0x1 - field public static final int RESPONSE_SIP_INTERVAL_TOO_SHORT = 7; // 0x7 - field public static final int RESPONSE_SIP_REQUEST_TIMEOUT = 5; // 0x5 - field public static final int RESPONSE_SIP_SERVICE_UNAVAILABLE = 8; // 0x8 - field public static final int RESPONSE_SUBSCRIBE_GENERIC_FAILURE = -1; // 0xffffffff - field public static final int RESPONSE_SUBSCRIBE_TOO_LARGE = 6; // 0x6 - field public static final int RESPONSE_SUCCESS = 0; // 0x0 - } - - public class RcsSipOptionsImplBase extends android.telephony.ims.stub.RcsCapabilityExchange { - ctor public RcsSipOptionsImplBase(); - method public final void onCapabilityRequestResponse(int, @NonNull String, @Nullable android.telephony.ims.RcsContactUceCapability, int) throws android.telephony.ims.ImsException; - method public final void onRemoteCapabilityRequest(@NonNull android.net.Uri, @NonNull android.telephony.ims.RcsContactUceCapability, int) throws android.telephony.ims.ImsException; - method public void respondToCapabilityRequest(@NonNull String, @NonNull android.telephony.ims.RcsContactUceCapability, int); - method public void respondToCapabilityRequestWithError(@NonNull android.net.Uri, int, @NonNull String, int); - method public void sendCapabilityRequest(@NonNull android.net.Uri, @NonNull android.telephony.ims.RcsContactUceCapability, int); - field public static final int RESPONSE_BAD_REQUEST = 5; // 0x5 - field public static final int RESPONSE_DOES_NOT_EXIST_ANYWHERE = 4; // 0x4 - field public static final int RESPONSE_GENERIC_FAILURE = -1; // 0xffffffff - field public static final int RESPONSE_NOT_FOUND = 3; // 0x3 - field public static final int RESPONSE_REQUEST_TIMEOUT = 2; // 0x2 - field public static final int RESPONSE_SUCCESS = 0; // 0x0 - field public static final int RESPONSE_TEMPORARILY_UNAVAILABLE = 1; // 0x1 - } - } package android.telephony.mbms { diff --git a/api/test-current.txt b/api/test-current.txt index 1e5b7b82a916..cb2b360cc5e9 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -3458,19 +3458,7 @@ package android.telephony.ims { } public class ImsRcsManager implements android.telephony.ims.RegistrationManager { - method @RequiresPermission("android.permission.READ_PRIVILEGED_PHONE_STATE") public void getRegistrationState(@NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Integer>); - method @RequiresPermission("android.permission.READ_PRIVILEGED_PHONE_STATE") public void getRegistrationTransportType(@NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Integer>); - method @RequiresPermission("android.permission.READ_PRIVILEGED_PHONE_STATE") public boolean isAvailable(int) throws android.telephony.ims.ImsException; - method @RequiresPermission("android.permission.READ_PRIVILEGED_PHONE_STATE") public boolean isCapable(int, int) throws android.telephony.ims.ImsException; - method @RequiresPermission("android.permission.READ_PRIVILEGED_PHONE_STATE") public void registerImsRegistrationCallback(@NonNull java.util.concurrent.Executor, @NonNull android.telephony.ims.RegistrationManager.RegistrationCallback) throws android.telephony.ims.ImsException; - method @RequiresPermission("android.permission.READ_PRIVILEGED_PHONE_STATE") public void registerRcsAvailabilityCallback(@NonNull java.util.concurrent.Executor, @NonNull android.telephony.ims.ImsRcsManager.AvailabilityCallback) throws android.telephony.ims.ImsException; - method @RequiresPermission("android.permission.READ_PRIVILEGED_PHONE_STATE") public void unregisterImsRegistrationCallback(@NonNull android.telephony.ims.RegistrationManager.RegistrationCallback); - method @RequiresPermission("android.permission.READ_PRIVILEGED_PHONE_STATE") public void unregisterRcsAvailabilityCallback(@NonNull android.telephony.ims.ImsRcsManager.AvailabilityCallback) throws android.telephony.ims.ImsException; - } - - public static class ImsRcsManager.AvailabilityCallback { - ctor public ImsRcsManager.AvailabilityCallback(); - method public void onAvailabilityChanged(@NonNull android.telephony.ims.feature.RcsFeature.RcsImsCapabilities); + method @NonNull public android.telephony.ims.RcsUceAdapter getUceAdapter(); } public class ImsService extends android.app.Service { @@ -3845,34 +3833,8 @@ package android.telephony.ims { } public class RcsUceAdapter { - method @RequiresPermission("android.permission.READ_PRIVILEGED_PHONE_STATE") public int getUcePublishState() throws android.telephony.ims.ImsException; method @RequiresPermission("android.permission.READ_PRIVILEGED_PHONE_STATE") public boolean isUceSettingEnabled() throws android.telephony.ims.ImsException; - method @RequiresPermission("android.permission.READ_PRIVILEGED_PHONE_STATE") public void requestCapabilities(@NonNull java.util.concurrent.Executor, @NonNull java.util.List<android.net.Uri>, @NonNull android.telephony.ims.RcsUceAdapter.CapabilitiesCallback) throws android.telephony.ims.ImsException; method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setUceSettingEnabled(boolean) throws android.telephony.ims.ImsException; - field public static final int ERROR_ALREADY_IN_QUEUE = 13; // 0xd - field public static final int ERROR_FORBIDDEN = 6; // 0x6 - field public static final int ERROR_GENERIC_FAILURE = 1; // 0x1 - field public static final int ERROR_INSUFFICIENT_MEMORY = 11; // 0xb - field public static final int ERROR_LOST_NETWORK = 12; // 0xc - field public static final int ERROR_NOT_AUTHORIZED = 5; // 0x5 - field public static final int ERROR_NOT_AVAILABLE = 3; // 0x3 - field public static final int ERROR_NOT_ENABLED = 2; // 0x2 - field public static final int ERROR_NOT_FOUND = 7; // 0x7 - field public static final int ERROR_NOT_REGISTERED = 4; // 0x4 - field public static final int ERROR_REQUEST_TIMEOUT = 10; // 0xa - field public static final int ERROR_REQUEST_TOO_LARGE = 8; // 0x8 - field public static final int PUBLISH_STATE_200_OK = 1; // 0x1 - field public static final int PUBLISH_STATE_NOT_PUBLISHED = 2; // 0x2 - field public static final int PUBLISH_STATE_OTHER_ERROR = 6; // 0x6 - field public static final int PUBLISH_STATE_RCS_PROVISION_ERROR = 4; // 0x4 - field public static final int PUBLISH_STATE_REQUEST_TIMEOUT = 5; // 0x5 - field public static final int PUBLISH_STATE_VOLTE_PROVISION_ERROR = 3; // 0x3 - } - - public static class RcsUceAdapter.CapabilitiesCallback { - ctor public RcsUceAdapter.CapabilitiesCallback(); - method public void onCapabilitiesReceived(@NonNull java.util.List<android.telephony.ims.RcsContactUceCapability>); - method public void onError(int); } } @@ -3964,23 +3926,8 @@ package android.telephony.ims.feature { public class RcsFeature extends android.telephony.ims.feature.ImsFeature { ctor public RcsFeature(); method public void changeEnabledCapabilities(@NonNull android.telephony.ims.feature.CapabilityChangeRequest, @NonNull android.telephony.ims.feature.ImsFeature.CapabilityCallbackProxy); - method @NonNull public android.telephony.ims.stub.RcsSipOptionsImplBase getOptionsExchangeImpl(); - method @NonNull public android.telephony.ims.stub.RcsPresenceExchangeImplBase getPresenceExchangeImpl(); - method public final void notifyCapabilitiesStatusChanged(@NonNull android.telephony.ims.feature.RcsFeature.RcsImsCapabilities); method public void onFeatureReady(); method public void onFeatureRemoved(); - method public boolean queryCapabilityConfiguration(int, int); - method @NonNull public final android.telephony.ims.feature.RcsFeature.RcsImsCapabilities queryCapabilityStatus(); - } - - public static class RcsFeature.RcsImsCapabilities extends android.telephony.ims.feature.ImsFeature.Capabilities { - ctor public RcsFeature.RcsImsCapabilities(int); - method public void addCapabilities(int); - method public boolean isCapable(int); - method public void removeCapabilities(int); - field public static final int CAPABILITY_TYPE_NONE = 0; // 0x0 - field public static final int CAPABILITY_TYPE_OPTIONS_UCE = 1; // 0x1 - field public static final int CAPABILITY_TYPE_PRESENCE_UCE = 2; // 0x2 } } @@ -4158,71 +4105,6 @@ package android.telephony.ims.stub { field public static final int INVALID_RESULT = -1; // 0xffffffff } - public class RcsCapabilityExchange { - ctor public RcsCapabilityExchange(); - method public final void onCommandUpdate(int, int) throws android.telephony.ims.ImsException; - field public static final int COMMAND_CODE_FETCH_ERROR = 4; // 0x4 - field public static final int COMMAND_CODE_GENERIC_FAILURE = 2; // 0x2 - field public static final int COMMAND_CODE_INSUFFICIENT_MEMORY = 6; // 0x6 - field public static final int COMMAND_CODE_INVALID_PARAM = 3; // 0x3 - field public static final int COMMAND_CODE_LOST_NETWORK_CONNECTION = 7; // 0x7 - field public static final int COMMAND_CODE_NOT_FOUND = 9; // 0x9 - field public static final int COMMAND_CODE_NOT_SUPPORTED = 8; // 0x8 - field public static final int COMMAND_CODE_NO_CHANGE_IN_CAP = 11; // 0xb - field public static final int COMMAND_CODE_REQUEST_TIMEOUT = 5; // 0x5 - field public static final int COMMAND_CODE_SERVICE_UNAVAILABLE = 10; // 0xa - field public static final int COMMAND_CODE_SERVICE_UNKNOWN = 0; // 0x0 - field public static final int COMMAND_CODE_SUCCESS = 1; // 0x1 - } - - public class RcsPresenceExchangeImplBase extends android.telephony.ims.stub.RcsCapabilityExchange { - ctor public RcsPresenceExchangeImplBase(); - method public final void onCapabilityRequestResponse(@NonNull java.util.List<android.telephony.ims.RcsContactUceCapability>, int) throws android.telephony.ims.ImsException; - method public final void onNetworkResponse(int, @NonNull String, int) throws android.telephony.ims.ImsException; - method public final void onNotifyUpdateCapabilites(int) throws android.telephony.ims.ImsException; - method public final void onUnpublish() throws android.telephony.ims.ImsException; - method public void requestCapabilities(@NonNull java.util.List<android.net.Uri>, int); - method public void updateCapabilities(@NonNull android.telephony.ims.RcsContactUceCapability, int); - field public static final int CAPABILITY_UPDATE_TRIGGER_ETAG_EXPIRED = 0; // 0x0 - field public static final int CAPABILITY_UPDATE_TRIGGER_MOVE_TO_2G = 6; // 0x6 - field public static final int CAPABILITY_UPDATE_TRIGGER_MOVE_TO_3G = 5; // 0x5 - field public static final int CAPABILITY_UPDATE_TRIGGER_MOVE_TO_EHRPD = 3; // 0x3 - field public static final int CAPABILITY_UPDATE_TRIGGER_MOVE_TO_HSPAPLUS = 4; // 0x4 - field public static final int CAPABILITY_UPDATE_TRIGGER_MOVE_TO_IWLAN = 8; // 0x8 - field public static final int CAPABILITY_UPDATE_TRIGGER_MOVE_TO_LTE_VOPS_DISABLED = 1; // 0x1 - field public static final int CAPABILITY_UPDATE_TRIGGER_MOVE_TO_LTE_VOPS_ENABLED = 2; // 0x2 - field public static final int CAPABILITY_UPDATE_TRIGGER_MOVE_TO_NR5G_VOPS_DISABLED = 10; // 0xa - field public static final int CAPABILITY_UPDATE_TRIGGER_MOVE_TO_NR5G_VOPS_ENABLED = 11; // 0xb - field public static final int CAPABILITY_UPDATE_TRIGGER_MOVE_TO_WLAN = 7; // 0x7 - field public static final int CAPABILITY_UPDATE_TRIGGER_UNKNOWN = 9; // 0x9 - field public static final int RESPONSE_FORBIDDEN = 3; // 0x3 - field public static final int RESPONSE_NOT_AUTHORIZED_FOR_PRESENCE = 2; // 0x2 - field public static final int RESPONSE_NOT_FOUND = 4; // 0x4 - field public static final int RESPONSE_NOT_REGISTERED = 1; // 0x1 - field public static final int RESPONSE_SIP_INTERVAL_TOO_SHORT = 7; // 0x7 - field public static final int RESPONSE_SIP_REQUEST_TIMEOUT = 5; // 0x5 - field public static final int RESPONSE_SIP_SERVICE_UNAVAILABLE = 8; // 0x8 - field public static final int RESPONSE_SUBSCRIBE_GENERIC_FAILURE = -1; // 0xffffffff - field public static final int RESPONSE_SUBSCRIBE_TOO_LARGE = 6; // 0x6 - field public static final int RESPONSE_SUCCESS = 0; // 0x0 - } - - public class RcsSipOptionsImplBase extends android.telephony.ims.stub.RcsCapabilityExchange { - ctor public RcsSipOptionsImplBase(); - method public final void onCapabilityRequestResponse(int, @NonNull String, @Nullable android.telephony.ims.RcsContactUceCapability, int) throws android.telephony.ims.ImsException; - method public final void onRemoteCapabilityRequest(@NonNull android.net.Uri, @NonNull android.telephony.ims.RcsContactUceCapability, int) throws android.telephony.ims.ImsException; - method public void respondToCapabilityRequest(@NonNull String, @NonNull android.telephony.ims.RcsContactUceCapability, int); - method public void respondToCapabilityRequestWithError(@NonNull android.net.Uri, int, @NonNull String, int); - method public void sendCapabilityRequest(@NonNull android.net.Uri, @NonNull android.telephony.ims.RcsContactUceCapability, int); - field public static final int RESPONSE_BAD_REQUEST = 5; // 0x5 - field public static final int RESPONSE_DOES_NOT_EXIST_ANYWHERE = 4; // 0x4 - field public static final int RESPONSE_GENERIC_FAILURE = -1; // 0xffffffff - field public static final int RESPONSE_NOT_FOUND = 3; // 0x3 - field public static final int RESPONSE_REQUEST_TIMEOUT = 2; // 0x2 - field public static final int RESPONSE_SUCCESS = 0; // 0x0 - field public static final int RESPONSE_TEMPORARILY_UNAVAILABLE = 1; // 0x1 - } - } package android.telephony.mbms { diff --git a/telephony/java/android/telephony/ims/ImsRcsManager.java b/telephony/java/android/telephony/ims/ImsRcsManager.java index 917f91fcf232..a2ad21c03f98 100644 --- a/telephony/java/android/telephony/ims/ImsRcsManager.java +++ b/telephony/java/android/telephony/ims/ImsRcsManager.java @@ -59,6 +59,7 @@ public class ImsRcsManager implements RegistrationManager { * @see #isAvailable(int) * @see #registerRcsAvailabilityCallback(Executor, AvailabilityCallback) * @see #unregisterRcsAvailabilityCallback(AvailabilityCallback) + * @hide */ public static class AvailabilityCallback { @@ -141,14 +142,16 @@ public class ImsRcsManager implements RegistrationManager { /** * @return A {@link RcsUceAdapter} used for User Capability Exchange (UCE) operations for * this subscription. - * @hide */ @NonNull public RcsUceAdapter getUceAdapter() { return new RcsUceAdapter(mSubId); } - /**{@inheritDoc}*/ + /** + * {@inheritDoc} + * @hide + */ @Override @RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void registerImsRegistrationCallback( @@ -177,7 +180,10 @@ public class ImsRcsManager implements RegistrationManager { } } - /**{@inheritDoc}*/ + /** + * {@inheritDoc + * @hide + */ @Override @RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void unregisterImsRegistrationCallback( @@ -199,7 +205,10 @@ public class ImsRcsManager implements RegistrationManager { } } - /**{@inheritDoc}*/ + /** + * {@inheritDoc} + * @hide + */ @Override @RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void getRegistrationState(@NonNull @CallbackExecutor Executor executor, @@ -229,7 +238,10 @@ public class ImsRcsManager implements RegistrationManager { } } - /**{@inheritDoc}*/ + /** + * {@inheritDoc} + * @hide + */ @Override @RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void getRegistrationTransportType(@NonNull @CallbackExecutor Executor executor, @@ -280,6 +292,7 @@ public class ImsRcsManager implements RegistrationManager { * {@link ImsRcsManager} is valid, but the ImsService associated with the subscription is not * available. This can happen if the ImsService has crashed, for example, or if the subscription * becomes inactive. See {@link ImsException#getCode()} for more information on the error codes. + * @hide */ @RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void registerRcsAvailabilityCallback(@NonNull @CallbackExecutor Executor executor, @@ -319,6 +332,7 @@ public class ImsRcsManager implements RegistrationManager { * @throws ImsException if the IMS service is not available when calling this method * {@link ImsRcsController#unregisterRcsAvailabilityCallback()}. * See {@link ImsException#getCode()} for more information on the error codes. + * @hide */ @RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void unregisterRcsAvailabilityCallback(@NonNull AvailabilityCallback c) @@ -361,6 +375,7 @@ public class ImsRcsManager implements RegistrationManager { * @throws ImsException if the IMS service is not available when calling this method * {@link ImsRcsController#isCapable(int, int)}. * See {@link ImsException#getCode()} for more information on the error codes. + * @hide */ @RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isCapable(@RcsFeature.RcsImsCapabilities.RcsImsCapabilityFlag int capability, @@ -395,6 +410,7 @@ public class ImsRcsManager implements RegistrationManager { * @throws ImsException if the IMS service is not available when calling this method * {@link ImsRcsController#isAvailable(int, int)}. * See {@link ImsException#getCode()} for more information on the error codes. + * @hide */ @RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isAvailable(@RcsFeature.RcsImsCapabilities.RcsImsCapabilityFlag int capability) diff --git a/telephony/java/android/telephony/ims/RcsUceAdapter.java b/telephony/java/android/telephony/ims/RcsUceAdapter.java index 5e3847f1359a..6974420dbaf4 100644 --- a/telephony/java/android/telephony/ims/RcsUceAdapter.java +++ b/telephony/java/android/telephony/ims/RcsUceAdapter.java @@ -52,55 +52,67 @@ public class RcsUceAdapter { /** * An unknown error has caused the request to fail. + * @hide */ public static final int ERROR_GENERIC_FAILURE = 1; /** * The carrier network does not have UCE support enabled for this subscriber. + * @hide */ public static final int ERROR_NOT_ENABLED = 2; /** * The data network that the device is connected to does not support UCE currently (e.g. it is * 1x only currently). + * @hide */ public static final int ERROR_NOT_AVAILABLE = 3; /** * The network has responded with SIP 403 error and a reason "User not registered." + * @hide */ public static final int ERROR_NOT_REGISTERED = 4; /** * The network has responded to this request with a SIP 403 error and reason "not authorized for * presence" for this subscriber. + * @hide */ public static final int ERROR_NOT_AUTHORIZED = 5; /** * The network has responded to this request with a SIP 403 error and no reason. + * @hide */ public static final int ERROR_FORBIDDEN = 6; /** * The contact URI requested is not provisioned for VoLTE or it is not known as an IMS * subscriber to the carrier network. + * @hide */ public static final int ERROR_NOT_FOUND = 7; /** * The capabilities request contained too many URIs for the carrier network to handle. Retry * with a lower number of contact numbers. The number varies per carrier. + * @hide */ // TODO: Try to integrate this into the API so that the service will split based on carrier. public static final int ERROR_REQUEST_TOO_LARGE = 8; /** * The network did not respond to the capabilities request before the request timed out. + * @hide */ public static final int ERROR_REQUEST_TIMEOUT = 10; /** * The request failed due to the service having insufficient memory. + * @hide */ public static final int ERROR_INSUFFICIENT_MEMORY = 11; /** * The network was lost while trying to complete the request. + * @hide */ public static final int ERROR_LOST_NETWORK = 12; /** * The request has failed because the same request has already been added to the queue. + * @hide */ public static final int ERROR_ALREADY_IN_QUEUE = 13; @@ -125,28 +137,33 @@ public class RcsUceAdapter { /** * The last publish has resulted in a "200 OK" response or the device is using SIP OPTIONS for * UCE. + * @hide */ public static final int PUBLISH_STATE_200_OK = 1; /** * The hasn't published its capabilities since boot or hasn't gotten any publish response yet. + * @hide */ public static final int PUBLISH_STATE_NOT_PUBLISHED = 2; /** * The device has tried to publish its capabilities, which has resulted in an error. This error * is related to the fact that the device is not VoLTE provisioned. + * @hide */ public static final int PUBLISH_STATE_VOLTE_PROVISION_ERROR = 3; /** * The device has tried to publish its capabilities, which has resulted in an error. This error * is related to the fact that the device is not RCS or UCE provisioned. + * @hide */ public static final int PUBLISH_STATE_RCS_PROVISION_ERROR = 4; /** * The last publish resulted in a "408 Request Timeout" response. + * @hide */ public static final int PUBLISH_STATE_REQUEST_TIMEOUT = 5; @@ -155,6 +172,7 @@ public class RcsUceAdapter { * or SIP 423 - "Interval too short". * <p> * Device shall retry with exponential back-off. + * @hide */ public static final int PUBLISH_STATE_OTHER_ERROR = 6; @@ -175,6 +193,7 @@ public class RcsUceAdapter { * Provides a one-time callback for the response to a UCE request. After this callback is called * by the framework, the reference to this callback will be discarded on the service side. * @see #requestCapabilities(Executor, List, CapabilitiesCallback) + * @hide */ public static class CapabilitiesCallback { @@ -226,6 +245,7 @@ public class RcsUceAdapter { * {@link RcsUceAdapter} is valid, but the ImsService associated with the subscription is not * available. This can happen if the ImsService has crashed, for example, or if the subscription * becomes inactive. See {@link ImsException#getCode()} for more information on the error codes. + * @hide */ @RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void requestCapabilities(@NonNull @CallbackExecutor Executor executor, @@ -288,6 +308,7 @@ public class RcsUceAdapter { * {@link RcsUceAdapter} is valid, but the ImsService associated with the subscription is not * available. This can happen if the ImsService has crashed, for example, or if the subscription * becomes inactive. See {@link ImsException#getCode()} for more information on the error codes. + * @hide */ @RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public @PublishState int getUcePublishState() throws ImsException { @@ -308,14 +329,13 @@ public class RcsUceAdapter { } /** - * The user’s setting for whether or not Presence and User Capability Exchange (UCE) is enabled - * for the associated subscription. + * The user’s setting for whether or not User Capability Exchange (UCE) is enabled for the + * associated subscription. + * <p> + * Note: This setting does not affect whether or not the device publishes its service + * capabilities if the subscription supports presence publication. * - * @return true if the user’s setting for UCE is enabled, false otherwise. If false, - * {@link ImsRcsManager#isCapable(int, int)} will return false for - * {@link RcsFeature.RcsImsCapabilities#CAPABILITY_TYPE_OPTIONS_UCE} and - * {@link RcsFeature.RcsImsCapabilities#CAPABILITY_TYPE_PRESENCE_UCE} - * @see #setUceSettingEnabled(boolean) + * @return true if the user’s setting for UCE is enabled, false otherwise. * @throws ImsException if the subscription associated with this instance of * {@link RcsUceAdapter} is valid, but the ImsService associated with the subscription is not * available. This can happen if the ImsService has crashed, for example, or if the subscription @@ -341,12 +361,12 @@ public class RcsUceAdapter { /** * Change the user’s setting for whether or not UCE is enabled for the associated subscription. - * @param isEnabled the user's setting for whether or not they wish for Presence and User - * Capability Exchange to be enabled. If false, - * {@link RcsFeature.RcsImsCapabilities#CAPABILITY_TYPE_OPTIONS_UCE} and - * {@link RcsFeature.RcsImsCapabilities#CAPABILITY_TYPE_PRESENCE_UCE} capability will be - * disabled, depending on which type of UCE the carrier supports. - * @see #isUceSettingEnabled() + * <p> + * Note: This setting does not affect whether or not the device publishes its service + * capabilities if the subscription supports presence publication. + * + * @param isEnabled the user's setting for whether or not they wish for User + * Capability Exchange to be enabled. * @throws ImsException if the subscription associated with this instance of * {@link RcsUceAdapter} is valid, but the ImsService associated with the subscription is not * available. This can happen if the ImsService has crashed, for example, or if the subscription diff --git a/telephony/java/android/telephony/ims/feature/RcsFeature.java b/telephony/java/android/telephony/ims/feature/RcsFeature.java index 8e67621b2ea3..98b0bcf6075b 100644 --- a/telephony/java/android/telephony/ims/feature/RcsFeature.java +++ b/telephony/java/android/telephony/ims/feature/RcsFeature.java @@ -193,6 +193,7 @@ public class RcsFeature extends ImsFeature { * of the capability and notify the capability status as true using * {@link #notifyCapabilitiesStatusChanged(RcsImsCapabilities)}. This will signal to the * framework that the capability is available for usage. + * @hide */ public static class RcsImsCapabilities extends Capabilities { /** @hide*/ @@ -286,6 +287,7 @@ public class RcsFeature extends ImsFeature { * set, the {@link RcsFeature} has brought up the capability and is ready for framework * requests. To change the status of the capabilities * {@link #notifyCapabilitiesStatusChanged(RcsImsCapabilities)} should be called. + * @hide */ @Override public @NonNull final RcsImsCapabilities queryCapabilityStatus() { @@ -296,6 +298,7 @@ public class RcsFeature extends ImsFeature { * Notify the framework that the capabilities status has changed. If a capability is enabled, * this signals to the framework that the capability has been initialized and is ready. * Call {@link #queryCapabilityStatus()} to return the current capability status. + * @hide */ public final void notifyCapabilitiesStatusChanged(@NonNull RcsImsCapabilities c) { if (c == null) { @@ -310,6 +313,7 @@ public class RcsFeature extends ImsFeature { * {@link #changeEnabledCapabilities(CapabilityChangeRequest, CapabilityCallbackProxy)} to * enable or disable capability A, this method should return the correct configuration for * capability A afterwards (until it has changed). + * @hide */ public boolean queryCapabilityConfiguration( @RcsImsCapabilities.RcsImsCapabilityFlag int capability, @@ -331,6 +335,7 @@ public class RcsFeature extends ImsFeature { * If for some reason one or more of these capabilities can not be enabled/disabled, * {@link CapabilityCallbackProxy#onChangeCapabilityConfigurationError(int, int, int)} should * be called for each capability change that resulted in an error. + * @hide */ @Override public void changeEnabledCapabilities(@NonNull CapabilityChangeRequest request, @@ -349,6 +354,7 @@ public class RcsFeature extends ImsFeature { * * @return An instance of {@link RcsSipOptionsImplBase} that implements SIP options exchange if * it is supported by the device. + * @hide */ public @NonNull RcsSipOptionsImplBase getOptionsExchangeImpl() { // Base Implementation, override to implement functionality @@ -364,6 +370,7 @@ public class RcsFeature extends ImsFeature { * * @return An instance of {@link RcsPresenceExchangeImplBase} that implements presence * exchange if it is supported by the device. + * @hide */ public @NonNull RcsPresenceExchangeImplBase getPresenceExchangeImpl() { // Base Implementation, override to implement functionality. diff --git a/telephony/java/android/telephony/ims/stub/RcsCapabilityExchange.java b/telephony/java/android/telephony/ims/stub/RcsCapabilityExchange.java index a24af2f74e27..fda295a27111 100644 --- a/telephony/java/android/telephony/ims/stub/RcsCapabilityExchange.java +++ b/telephony/java/android/telephony/ims/stub/RcsCapabilityExchange.java @@ -17,8 +17,6 @@ package android.telephony.ims.stub; import android.annotation.IntDef; -import android.annotation.SystemApi; -import android.annotation.TestApi; import android.os.RemoteException; import android.telephony.ims.ImsException; import android.telephony.ims.aidl.IRcsFeatureListener; @@ -34,8 +32,6 @@ import java.lang.annotation.RetentionPolicy; * * @hide */ -@SystemApi -@TestApi public class RcsCapabilityExchange { /** Service is unknown. */ diff --git a/telephony/java/android/telephony/ims/stub/RcsPresenceExchangeImplBase.java b/telephony/java/android/telephony/ims/stub/RcsPresenceExchangeImplBase.java index f200ea2af2bc..bb034489a296 100644 --- a/telephony/java/android/telephony/ims/stub/RcsPresenceExchangeImplBase.java +++ b/telephony/java/android/telephony/ims/stub/RcsPresenceExchangeImplBase.java @@ -18,8 +18,6 @@ package android.telephony.ims.stub; import android.annotation.IntDef; import android.annotation.NonNull; -import android.annotation.SystemApi; -import android.annotation.TestApi; import android.net.Uri; import android.os.RemoteException; import android.telephony.ims.ImsException; @@ -39,8 +37,6 @@ import java.util.List; * * @hide */ -@SystemApi -@TestApi public class RcsPresenceExchangeImplBase extends RcsCapabilityExchange { private static final String LOG_TAG = "RcsPresenceExchangeIB"; diff --git a/telephony/java/android/telephony/ims/stub/RcsSipOptionsImplBase.java b/telephony/java/android/telephony/ims/stub/RcsSipOptionsImplBase.java index 355c4dde75d8..2035fac4fae0 100644 --- a/telephony/java/android/telephony/ims/stub/RcsSipOptionsImplBase.java +++ b/telephony/java/android/telephony/ims/stub/RcsSipOptionsImplBase.java @@ -19,8 +19,6 @@ package android.telephony.ims.stub; import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.Nullable; -import android.annotation.SystemApi; -import android.annotation.TestApi; import android.net.Uri; import android.os.RemoteException; import android.telephony.ims.ImsException; @@ -37,8 +35,6 @@ import java.lang.annotation.RetentionPolicy; * * @hide */ -@SystemApi -@TestApi public class RcsSipOptionsImplBase extends RcsCapabilityExchange { private static final String LOG_TAG = "RcsSipOptionsImplBase"; |