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

Merge changes from topics "delegate_regi_new_state_losing_pdn", "ims_rcs_api_improvement_delegate_regi_state" am: 5fd9a457ce

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

Change-Id: Id4b43dee68b4ebb126dd979415b30097df87fbee
This commit is contained in:
Brad Ebinger
2021-12-07 20:37:01 +00:00
committed by Automerger Merge Worker
parent 90cd156539 5fd9a457ce
commit b1e1f7b730
2 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12892,8 +12892,10 @@ package android.telephony.ims {
field public static final int DEREGISTERED_REASON_UNKNOWN = 0; // 0x0 field public static final int DEREGISTERED_REASON_UNKNOWN = 0; // 0x0
field public static final int DEREGISTERING_REASON_DESTROY_PENDING = 6; // 0x6 field public static final int DEREGISTERING_REASON_DESTROY_PENDING = 6; // 0x6
field public static final int DEREGISTERING_REASON_FEATURE_TAGS_CHANGING = 5; // 0x5 field public static final int DEREGISTERING_REASON_FEATURE_TAGS_CHANGING = 5; // 0x5
field public static final int DEREGISTERING_REASON_LOSING_PDN = 7; // 0x7
field public static final int DEREGISTERING_REASON_PDN_CHANGE = 3; // 0x3 field public static final int DEREGISTERING_REASON_PDN_CHANGE = 3; // 0x3
field public static final int DEREGISTERING_REASON_PROVISIONING_CHANGE = 4; // 0x4 field public static final int DEREGISTERING_REASON_PROVISIONING_CHANGE = 4; // 0x4
field public static final int DEREGISTERING_REASON_UNSPECIFIED = 8; // 0x8
} }
public static final class DelegateRegistrationState.Builder { public static final class DelegateRegistrationState.Builder {

21
telephony/java/android/telephony/ims/DelegateRegistrationState.java
View File

@@ -97,6 +97,23 @@ public final class DelegateRegistrationState implements Parcelable {
*/ */
public static final int DEREGISTERING_REASON_DESTROY_PENDING = 6; public static final int DEREGISTERING_REASON_DESTROY_PENDING = 6;
/**
* This feature tag is deregistering because the PDN that the IMS registration is on
* is being torn down.
* <p>
* All open SIP Dialogs associated with this feature tag must be closed
* using {@link SipDelegateConnection#cleanupSession(String)} before this operation can proceed.
*/
public static final int DEREGISTERING_REASON_LOSING_PDN = 7;
/**
* This feature tag is deregistering because of an unspecified reason.
* <p>
* All open SIP Dialogs associated with this feature tag must be closed
* using {@link SipDelegateConnection#cleanupSession(String)} before this operation can proceed.
*/
public static final int DEREGISTERING_REASON_UNSPECIFIED = 8;
/** @hide */ /** @hide */
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@IntDef(prefix = "DEREGISTERED_REASON_", value = { @IntDef(prefix = "DEREGISTERED_REASON_", value = {
@@ -113,7 +130,9 @@ public final class DelegateRegistrationState implements Parcelable {
DEREGISTERING_REASON_PDN_CHANGE, DEREGISTERING_REASON_PDN_CHANGE,
DEREGISTERING_REASON_PROVISIONING_CHANGE, DEREGISTERING_REASON_PROVISIONING_CHANGE,
DEREGISTERING_REASON_FEATURE_TAGS_CHANGING, DEREGISTERING_REASON_FEATURE_TAGS_CHANGING,
DEREGISTERING_REASON_DESTROY_PENDING DEREGISTERING_REASON_DESTROY_PENDING,
DEREGISTERING_REASON_LOSING_PDN,
DEREGISTERING_REASON_UNSPECIFIED
}) })
public @interface DeregisteringReason {} public @interface DeregisteringReason {}