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

Commit 49b4f188 authored by Hunsuk Choi's avatar Hunsuk Choi
Browse files

Change the type of token of startImsTraffic from String to int 

Bug: 219242095
Test: atest
Change-Id: I6342e1096e114e0855541cb601ca93e5b13e3ca8
parent f8a74fc4

src/java/com/android/internal/telephony/CommandsInterface.java

+2 −2
Original line number Diff line number Diff line
@@ -2862,7 +2862,7 @@ public interface CommandsInterface { 
     * @param trafficType IMS traffic type like registration, voice, video, SMS, emergency, and etc.

     * @param accessNetworkType The type of underlying radio access network used.

     */

    default void startImsTraffic(String token, int trafficType,

    default void startImsTraffic(int token, int trafficType,

            @AccessNetworkConstants.RadioAccessNetworkType int accessNetworkType,

            Message result) {}
@@ -2871,7 +2871,7 @@ public interface CommandsInterface { 
     *

     * @param token The token assigned by startImsTraffic.

     */

    default void stopImsTraffic(String token, Message result) {}

    default void stopImsTraffic(int token, Message result) {}



    /**

     * Triggers the UE initiated EPS fallback procedure.

src/java/com/android/internal/telephony/ImsIndication.java

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ public class ImsIndication extends IRadioImsIndication.Stub { 
     * @param token The token provided by {@link #startImsTraffic}.

     * @param failureInfo Connection failure information.

     */

    public void onConnectionSetupFailure(int indicationType, String token,

    public void onConnectionSetupFailure(int indicationType, int token,

            android.hardware.radio.ims.ConnectionFailureInfo failureInfo) {

        mRil.processIndication(RIL.IMS_SERVICE, indicationType);

src/java/com/android/internal/telephony/RIL.java

+2 −3
Original line number Diff line number Diff line
@@ -5188,8 +5188,7 @@ public class RIL extends BaseCommands implements CommandsInterface { 
    }



    @Override

    public void startImsTraffic(String token,

            int trafficType, int accessNetworkType, Message result) {

    public void startImsTraffic(int token, int trafficType, int accessNetworkType, Message result) {

        RadioImsProxy imsProxy = getRadioServiceProxy(RadioImsProxy.class, result);

        if (imsProxy.isEmpty()) return;

        if (mRadioVersion.greaterOrEqual(RADIO_HAL_VERSION_2_1)) {
@@ -5218,7 +5217,7 @@ public class RIL extends BaseCommands implements CommandsInterface { 
    }



    @Override

    public void stopImsTraffic(String token, Message result) {

    public void stopImsTraffic(int token, Message result) {

        RadioImsProxy imsProxy = getRadioServiceProxy(RadioImsProxy.class, result);

        if (imsProxy.isEmpty()) return;

        if (mRadioVersion.greaterOrEqual(RADIO_HAL_VERSION_2_1)) {

src/java/com/android/internal/telephony/RadioImsProxy.java

+2 −2
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ public class RadioImsProxy extends RadioServiceProxy { 
     * @param accessNetworkType The type of underlying radio access network used.

     * @throws RemoteException.

     */

    public void startImsTraffic(int serial, String token, int trafficType, int accessNetworkType)

    public void startImsTraffic(int serial, int token, int trafficType, int accessNetworkType)

            throws RemoteException {

        if (isEmpty()) return;

        if (isAidl()) {
@@ -148,7 +148,7 @@ public class RadioImsProxy extends RadioServiceProxy { 
     * @param token The token assigned by startImsTraffic.

     * @throws RemoteException.

     */

    public void stopImsTraffic(int serial, String token)

    public void stopImsTraffic(int serial, int token)

            throws RemoteException {

        if (isEmpty()) return;

        if (isAidl()) {