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

Commit b3f8228f authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Expose APIs for SipTransport registration management"

parents 1db88034 915a0307

core/api/system-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -11806,6 +11806,8 @@ package android.telephony.ims.stub { 
    method public final void onSubscriberAssociatedUriChanged(android.net.Uri[]);

    method public final void onTechnologyChangeFailed(int, android.telephony.ims.ImsReasonInfo);

    method public void triggerFullNetworkRegistration(@IntRange(from=100, to=699) int, @Nullable String);

    method public void triggerSipDelegateDeregistration();

    method public void updateSipDelegateRegistration();

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

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

    field public static final int REGISTRATION_TECH_NONE = -1; // 0xffffffff

telephony/java/android/telephony/ims/aidl/IImsRegistration.aidl

+3 −1
Original line number Diff line number Diff line
@@ -29,4 +29,6 @@ interface IImsRegistration { 
   oneway void addRegistrationCallback(IImsRegistrationCallback c);

   oneway void removeRegistrationCallback(IImsRegistrationCallback c);

   oneway void triggerFullNetworkRegistration(int sipCode, String sipReason);

   oneway void triggerUpdateSipDelegateRegistration();

   oneway void triggerSipDelegateDeregistration();

}

telephony/java/android/telephony/ims/stub/ImsRegistrationImplBase.java

+13 −2
Original line number Diff line number Diff line
@@ -38,6 +38,9 @@ import java.lang.annotation.RetentionPolicy; 
/**

 * Controls IMS registration for this ImsService and notifies the framework when the IMS

 * registration for this ImsService has changed status.

 * <p>

 * Note: There is no guarantee on the thread that the calls from the framework will be called on. It

 * is the implementors responsibility to handle moving the calls to a working thread if required.

 * @hide

 */

@SystemApi
@@ -97,6 +100,16 @@ public class ImsRegistrationImplBase { 
        public void triggerFullNetworkRegistration(int sipCode, String sipReason) {

            ImsRegistrationImplBase.this.triggerFullNetworkRegistration(sipCode, sipReason);

        }



        @Override

        public void triggerUpdateSipDelegateRegistration() {

            ImsRegistrationImplBase.this.updateSipDelegateRegistration();

        }



        @Override

        public void triggerSipDelegateDeregistration() {

            ImsRegistrationImplBase.this.triggerSipDelegateDeregistration();

        }

    };



    private final RemoteCallbackListExt<IImsRegistrationCallback> mCallbacks =
@@ -138,7 +151,6 @@ public class ImsRegistrationImplBase { 
     * If the SIP delegate feature tag configuration has changed, then this method will be

     * called in order to let the ImsService know that it can pick up these changes in the IMS

     * registration.

     * @hide

     */

    public void updateSipDelegateRegistration() {

        // Stub implementation, ImsService should implement this
@@ -155,7 +167,6 @@ public class ImsRegistrationImplBase { 
     * <p>

     * This should not affect the registration of features managed by the ImsService itself, such as

     * feature tags related to MMTEL registration.

     * @hide

     */

    public void triggerSipDelegateDeregistration() {

        // Stub implementation, ImsService should implement this