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

Commit 49b81dd6 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 VtsHalRadioTargetTest
Change-Id: Ie9584fb10111f480e89a0119d17407e76d39fd89
parent eaa8469b

radio/aidl/aidl_api/android.hardware.radio.ims/current/android/hardware/radio/ims/IRadioIms.aidl

+2 −2
Original line number Diff line number Diff line
@@ -36,8 +36,8 @@ package android.hardware.radio.ims; 
interface IRadioIms {

  oneway void setSrvccCallInfo(int serial, in android.hardware.radio.ims.SrvccCall[] srvccCalls);

  oneway void updateImsRegistrationInfo(int serial, in android.hardware.radio.ims.ImsRegistration imsRegistration);

  oneway void startImsTraffic(int serial, in String token, android.hardware.radio.ims.ImsTrafficType imsTrafficType, android.hardware.radio.AccessNetwork accessNetworkType);

  oneway void stopImsTraffic(int serial, in String token);

  oneway void startImsTraffic(int serial, int token, android.hardware.radio.ims.ImsTrafficType imsTrafficType, android.hardware.radio.AccessNetwork accessNetworkType);

  oneway void stopImsTraffic(int serial, int token);

  oneway void triggerEpsFallback(int serial, in android.hardware.radio.ims.EpsFallbackReason reason);

  oneway void setResponseFunctions(in android.hardware.radio.ims.IRadioImsResponse radioImsResponse, in android.hardware.radio.ims.IRadioImsIndication radioImsIndication);

  oneway void sendAnbrQuery(int serial, android.hardware.radio.ims.ImsStreamType mediaType, android.hardware.radio.ims.ImsStreamDirection direction, int bitsPerSecond);

radio/aidl/aidl_api/android.hardware.radio.ims/current/android/hardware/radio/ims/IRadioImsIndication.aidl

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
package android.hardware.radio.ims;

@VintfStability

interface IRadioImsIndication {

  oneway void onConnectionSetupFailure(in android.hardware.radio.RadioIndicationType type, in String token, in android.hardware.radio.ims.ConnectionFailureInfo info);

  oneway void onConnectionSetupFailure(in android.hardware.radio.RadioIndicationType type, int token, in android.hardware.radio.ims.ConnectionFailureInfo info);

  oneway void notifyAnbr(in android.hardware.radio.RadioIndicationType type, in android.hardware.radio.ims.ImsStreamType mediaType, in android.hardware.radio.ims.ImsStreamDirection direction, int bitsPerSecond);

  oneway void triggerImsDeregistration(in android.hardware.radio.RadioIndicationType type, in android.hardware.radio.ims.ImsDeregistrationReason reason);

}

radio/aidl/android/hardware/radio/ims/IRadioIms.aidl

+2 −2
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ oneway interface IRadioIms { 
     *

     * Response function is IRadioImsResponse.startImsTrafficResponse()

     */

    void startImsTraffic(int serial, in String token,

    void startImsTraffic(int serial, int token,

            ImsTrafficType imsTrafficType, AccessNetwork accessNetworkType);



    /**
@@ -101,7 +101,7 @@ oneway interface IRadioIms { 
     *

     * Response function is IRadioImsResponse.stopImsTrafficResponse()

     */

    void stopImsTraffic(int serial, in String token);

    void stopImsTraffic(int serial, int token);



    /**

     * Triggers the UE initiated EPS fallback when a MO voice call failed to establish on 5G NR

radio/aidl/android/hardware/radio/ims/IRadioImsIndication.aidl

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ oneway interface IRadioImsIndication { 
     * @param info Connection failure information

     */

    void onConnectionSetupFailure(

            in RadioIndicationType type, in String token, in ConnectionFailureInfo info);

            in RadioIndicationType type, int token, in ConnectionFailureInfo info);



    /**

     * Access Network Bitrate Recommendation (ANBR), see 3GPP TS 26.114.

radio/aidl/vts/radio_ims_indication.cpp

+2 −2
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
RadioImsIndication::RadioImsIndication(RadioServiceTest& parent) : parent_ims(parent) {}



ndk::ScopedAStatus RadioImsIndication::onConnectionSetupFailure(RadioIndicationType /*type*/,

        const std::string& /*token*/, const ConnectionFailureInfo& /*info*/) {

        int32_t /*token*/, const ConnectionFailureInfo& /*info*/) {

    return ndk::ScopedAStatus::ok();

}