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

Commit 7a964f21 authored by James Lin's avatar James Lin Committed by Gerrit Code Review
Browse files

Merge "[RCS UCE] Modify the data type of parameter retryAfter from String to long"

parents 777d7d83 d0798810

telephony/java/android/telephony/ims/aidl/ISubscribeResponseCallback.aidl

+1 −1
Original line number Diff line number Diff line
@@ -32,5 +32,5 @@ oneway interface ISubscribeResponseCallback { 
    void onNetworkResponse(int code, in String reason);

    void onNotifyCapabilitiesUpdate(in List<String> pidfXmls);

    void onResourceTerminated(in List<RcsContactTerminatedReason> uriTerminatedReason);

    void onTerminated(in String reason, in String retryAfter);

    void onTerminated(in String reason, long retryAfterMilliseconds);

}

telephony/java/android/telephony/ims/aidl/RcsSubscribeResponseAidlWrapper.java

+2 −2
Original line number Diff line number Diff line
@@ -86,9 +86,9 @@ public class RcsSubscribeResponseAidlWrapper implements SubscribeResponseCallbac 
    }



    @Override

    public void onTerminated(String reason, String retryAfter) throws ImsException {

    public void onTerminated(String reason, long retryAfterMilliseconds) throws ImsException {

        try {

            mResponseBinder.onTerminated(reason, retryAfter);

            mResponseBinder.onTerminated(reason, retryAfterMilliseconds);

        } catch (RemoteException e) {

        }

    }

telephony/java/android/telephony/ims/stub/RcsCapabilityExchangeImplBase.java

+1 −1
Original line number Diff line number Diff line
@@ -250,7 +250,7 @@ public class RcsCapabilityExchangeImplBase { 
         * This allows the framework to know that there will no longer be any

         * capability updates for the requested operationToken.

         */

        void onTerminated(String reason, String retryAfter) throws ImsException;

        void onTerminated(String reason, long retryAfterMilliseconds) throws ImsException;

    }