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

Commit 5fd9a457 authored by Brad Ebinger's avatar Brad Ebinger Committed by Gerrit Code Review
Browse files

Merge changes from topics "delegate_regi_new_state_losing_pdn",... 

Merge changes from topics "delegate_regi_new_state_losing_pdn", "ims_rcs_api_improvement_delegate_regi_state"

* changes:
  DelegateRegistrationState Improvement adding new states for DelegateRegistrationState:  - DEREGISTERING_REASON_LOSING_PDN  - DEREGISTERING_REASON_UNSPECIFIED
  IMS RCS API Improvements-DelegateRegistrationState
parents 1db942e7 0b1a783d

core/api/system-current.txt

+4 −0
Original line number Diff line number Diff line
@@ -12884,6 +12884,7 @@ package android.telephony.ims { 
    method @NonNull public java.util.Set<android.telephony.ims.FeatureTagState> getDeregisteredFeatureTags();

    method @NonNull public java.util.Set<android.telephony.ims.FeatureTagState> getDeregisteringFeatureTags();

    method @NonNull public java.util.Set<java.lang.String> getRegisteredFeatureTags();

    method @NonNull public java.util.Set<java.lang.String> getRegisteringFeatureTags();

    method public void writeToParcel(@NonNull android.os.Parcel, int);

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

    field public static final int DEREGISTERED_REASON_NOT_PROVISIONED = 1; // 0x1
@@ -12891,8 +12892,10 @@ package android.telephony.ims { 
    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_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_PROVISIONING_CHANGE = 4; // 0x4

    field public static final int DEREGISTERING_REASON_UNSPECIFIED = 8; // 0x8

  }















  public static final class DelegateRegistrationState.Builder {









@@ -12901,6 +12904,7 @@ package android.telephony.ims {













    method @NonNull public android.telephony.ims.DelegateRegistrationState.Builder addDeregisteringFeatureTag(@NonNull String, int);















    method @NonNull public android.telephony.ims.DelegateRegistrationState.Builder addRegisteredFeatureTag(@NonNull String);















    method @NonNull public android.telephony.ims.DelegateRegistrationState.Builder addRegisteredFeatureTags(@NonNull java.util.Set<java.lang.String>);













    method @NonNull public android.telephony.ims.DelegateRegistrationState.Builder addRegisteringFeatureTags(@NonNull java.util.Set<java.lang.String>);















    method @NonNull public android.telephony.ims.DelegateRegistrationState build();















  }







































telephony/java/android/telephony/ims/DelegateRegistrationState.java



+53
−4




























Original line number
Diff line number
Diff line








@@ -97,6 +97,23 @@ public final class DelegateRegistrationState implements Parcelable {













     */















    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 */















    @Retention(RetentionPolicy.SOURCE)















    @IntDef(prefix = "DEREGISTERED_REASON_", value = {









@@ -113,10 +130,13 @@ public final class DelegateRegistrationState implements Parcelable {













            DEREGISTERING_REASON_PDN_CHANGE,















            DEREGISTERING_REASON_PROVISIONING_CHANGE,















            DEREGISTERING_REASON_FEATURE_TAGS_CHANGING,













            DEREGISTERING_REASON_DESTROY_PENDING













            DEREGISTERING_REASON_DESTROY_PENDING,













            DEREGISTERING_REASON_LOSING_PDN,













            DEREGISTERING_REASON_UNSPECIFIED















    })















    public @interface DeregisteringReason {}





























    private ArraySet<String> mRegisteringTags = new ArraySet<>();















    private ArraySet<String> mRegisteredTags = new ArraySet<>();















    private final ArraySet<FeatureTagState> mDeregisteringTags = new ArraySet<>();















    private final ArraySet<FeatureTagState> mDeregisteredTags = new ArraySet<>();









@@ -133,6 +153,20 @@ public final class DelegateRegistrationState implements Parcelable {













            mState = new DelegateRegistrationState();















        }





























        /**













         * Add the set of feature tags that are associated with this SipDelegate and













         * the IMS stack is actively trying to register on the carrier network.













         *













         * The feature tags will either move to the registered or deregistered state













         * depending on the result of the registration.













         * @param featureTags The IMS media feature tags that are in the progress of registering.













         * @return The in-progress Builder instance for RegistrationState. ]













         */













        public @NonNull Builder addRegisteringFeatureTags(@NonNull Set<String> featureTags) {













            mState.mRegisteringTags.addAll(featureTags);













            return this;













        }





























        /**















         * Add a feature tag that is currently included in the current network IMS Registration.















         * @param featureTag The IMS media feature tag included in the current IMS registration.










@@ -209,6 +243,17 @@ public final class DelegateRegistrationState implements Parcelable {













        mRegisteredTags = (ArraySet<String>) source.readArraySet(null);















        readStateFromParcel(source, mDeregisteringTags);















        readStateFromParcel(source, mDeregisteredTags);













        mRegisteringTags = (ArraySet<String>) source.readArraySet(null);













    }



























    /**













     * Get the feature tags that are associated with this SipDelegate that the IMS stack is actively













     * trying to register on the carrier network.













     * @return A Set of feature tags associated with this SipDelegate that the IMS service is













     * currently trying to register on the  carrier network.













     */













    public @NonNull Set<String> getRegisteringFeatureTags() {













        return new ArraySet<>(mRegisteringTags);















    }































    /**










@@ -286,6 +331,7 @@ public final class DelegateRegistrationState implements Parcelable {













        dest.writeArraySet(mRegisteredTags);















        writeStateToParcel(dest, mDeregisteringTags);















        writeStateToParcel(dest, mDeregisteredTags);













        dest.writeArraySet(mRegisteringTags);















    }































    private void writeStateToParcel(Parcel dest, Set<FeatureTagState> state) {









@@ -311,19 +357,22 @@ public final class DelegateRegistrationState implements Parcelable {













        if (this == o) return true;















        if (o == null || getClass() != o.getClass()) return false;















        DelegateRegistrationState that = (DelegateRegistrationState) o;













        return mRegisteredTags.equals(that.mRegisteredTags)













        return mRegisteringTags.equals(that.mRegisteringTags)













                && mRegisteredTags.equals(that.mRegisteredTags)















                && mDeregisteringTags.equals(that.mDeregisteringTags)















                && mDeregisteredTags.equals(that.mDeregisteredTags);















    }































    @Override















    public int hashCode() {













        return Objects.hash(mRegisteredTags, mDeregisteringTags, mDeregisteredTags);













        return Objects.hash(mRegisteringTags, mRegisteredTags,













                mDeregisteringTags, mDeregisteredTags);















    }































    @Override















    public String toString() {















        return "DelegateRegistrationState{ registered={" + mRegisteredTags













                + "}, registering={" + mRegisteringTags















                + "}, deregistering={" + mDeregisteringTags + "}, deregistered={"















                + mDeregisteredTags + "}}";















    }