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

Remove the deprecated SipDelegate methods pertaining to Dialogs

Browse Source 
Remove deprecated APIs pertaining to closeDialog now that all
dependencies on this method have been removed.

Bug: 187747944
Test: atest CtsTelephonyTestCases
Change-Id: I2675d3bd15199c75d70560b7ba529f267ac08970
This commit is contained in:
Brad Ebinger
2021-05-10 21:49:25 +00:00
parent 3ea60e26f5
commit f43e471124
3 changed files with 4 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11969,8 +11969,7 @@ package android.telephony.ims {
}
public interface SipDelegateConnection {
method public default void cleanupSession(@NonNull String);
method @Deprecated public default void closeDialog(@NonNull String);
method public void cleanupSession(@NonNull String);
method public void notifyMessageReceiveError(@NonNull String, int);
method public void notifyMessageReceived(@NonNull String);
method public void sendMessage(@NonNull android.telephony.ims.SipMessage, long);
@@ -12420,8 +12419,7 @@ package android.telephony.ims.stub {
}
public interface SipDelegate {
method public default void cleanupSession(@NonNull String);
method @Deprecated public default void closeDialog(@NonNull String);
method public void cleanupSession(@NonNull String);
method public void notifyMessageReceiveError(@NonNull String, int);
method public void notifyMessageReceived(@NonNull String);
method public void sendMessage(@NonNull android.telephony.ims.SipMessage, long);

22
telephony/java/android/telephony/ims/SipDelegateConnection.java
View File

@@ -61,26 +61,6 @@ public interface SipDelegateConnection {
*/
void notifyMessageReceived(@NonNull String viaTransactionId);
/**
* The SIP Dialog associated with the provided Call-ID is being closed and routing resources
* associated with the SIP dialog are free to be released.
* <p>
* Calling this method is also mandatory for situations where the framework IMS stack is waiting
* for pending SIP dialogs to be closed before it can perform a handover or apply a provisioning
* change. See {@link DelegateRegistrationState} for more information about
* the scenarios where this can occur.
* <p>
* This method will need to be called for each SIP dialog managed by this application when it is
* closed.
* @param callId The call-ID header value associated with the ongoing SIP Dialog that is
* closing.
* @deprecated closeDialog does not capture INVITE forking. Use {@link #cleanupSession} instead.
*/
@Deprecated
default void closeDialog(@NonNull String callId) {
cleanupSession(callId);
}
/**
* The SIP session associated with the provided Call-ID is being closed and routing resources
* associated with the session are free to be released. Each SIP session may contain multiple
@@ -97,7 +77,7 @@ public interface SipDelegateConnection {
* @param callId The call-ID header value associated with the ongoing SIP Dialog that is
* closing.
*/
default void cleanupSession(@NonNull String callId) { }
void cleanupSession(@NonNull String callId);
/**
* Notify the SIP delegate that the SIP message has been received from

23
telephony/java/android/telephony/ims/stub/SipDelegate.java
View File

@@ -63,25 +63,6 @@ public interface SipDelegate {
*/
void sendMessage(@NonNull SipMessage message, long configVersion);
/**
* The framework is requesting that routing resources associated with the SIP dialog using the
* provided Call-ID to be cleaned up.
* <p>
* Typically, a SIP Dialog close event will be signalled by that dialog receiving a BYE or
* 200 OK message, however, the IMS application will still call
* {@link SipDelegateConnection#closeDialog(String)} to signal to the framework that resources
* can be released. In some cases, the framework will request that the ImsService close the
* dialog due to the open dialog holding up an event such as applying a provisioning change or
* handing over to another transport type. See {@link DelegateRegistrationState}.
*
* @param callId The call-ID header value associated with the ongoing SIP Dialog that the
* framework is requesting be closed.
* @deprecated This method does not take into account INVITE forking. Use
* {@link #cleanupSession(String)} instead.
*/
@Deprecated
default void closeDialog(@NonNull String callId) { }
/**
* The remote IMS application has closed a SIP session and the routing resources associated
* with the SIP session using the provided Call-ID may now be cleaned up.
@@ -97,9 +78,7 @@ public interface SipDelegate {
* @param callId The call-ID header value associated with the ongoing SIP Session that the
* framework is requesting be cleaned up.
*/
default void cleanupSession(@NonNull String callId) {
closeDialog(callId);
}
void cleanupSession(@NonNull String callId);
/**
* The remote application has received the SIP message and is processing it.