Change the type of token of startImsTraffic from String to int
Bug: 219242095
Test: atest VtsHalRadioTargetTest
Change-Id: Ie9584fb10111f480e89a0119d17407e76d39fd89
diff --git a/radio/aidl/aidl_api/android.hardware.radio.ims/current/android/hardware/radio/ims/IRadioIms.aidl b/radio/aidl/aidl_api/android.hardware.radio.ims/current/android/hardware/radio/ims/IRadioIms.aidl
index ee5c572..e740345 100644
--- a/radio/aidl/aidl_api/android.hardware.radio.ims/current/android/hardware/radio/ims/IRadioIms.aidl
+++ b/radio/aidl/aidl_api/android.hardware.radio.ims/current/android/hardware/radio/ims/IRadioIms.aidl
@@ -36,8 +36,8 @@
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);
diff --git a/radio/aidl/aidl_api/android.hardware.radio.ims/current/android/hardware/radio/ims/IRadioImsIndication.aidl b/radio/aidl/aidl_api/android.hardware.radio.ims/current/android/hardware/radio/ims/IRadioImsIndication.aidl
index 63f29f3..ef6b4cc 100644
--- a/radio/aidl/aidl_api/android.hardware.radio.ims/current/android/hardware/radio/ims/IRadioImsIndication.aidl
+++ b/radio/aidl/aidl_api/android.hardware.radio.ims/current/android/hardware/radio/ims/IRadioImsIndication.aidl
@@ -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);
}
diff --git a/radio/aidl/android/hardware/radio/ims/IRadioIms.aidl b/radio/aidl/android/hardware/radio/ims/IRadioIms.aidl
index 76b1f03..c5412e1 100644
--- a/radio/aidl/android/hardware/radio/ims/IRadioIms.aidl
+++ b/radio/aidl/android/hardware/radio/ims/IRadioIms.aidl
@@ -88,7 +88,7 @@
*
* 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 @@
*
* 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
diff --git a/radio/aidl/android/hardware/radio/ims/IRadioImsIndication.aidl b/radio/aidl/android/hardware/radio/ims/IRadioImsIndication.aidl
index 82773f2..d123d07 100644
--- a/radio/aidl/android/hardware/radio/ims/IRadioImsIndication.aidl
+++ b/radio/aidl/android/hardware/radio/ims/IRadioImsIndication.aidl
@@ -37,7 +37,7 @@
* @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.
diff --git a/radio/aidl/vts/radio_ims_indication.cpp b/radio/aidl/vts/radio_ims_indication.cpp
index f382de0..988038b 100644
--- a/radio/aidl/vts/radio_ims_indication.cpp
+++ b/radio/aidl/vts/radio_ims_indication.cpp
@@ -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();
}
@@ -31,4 +31,4 @@
ndk::ScopedAStatus RadioImsIndication::triggerImsDeregistration(RadioIndicationType /*type*/,
ImsDeregistrationReason /*reason*/) {
return ndk::ScopedAStatus::ok();
-}
\ No newline at end of file
+}
diff --git a/radio/aidl/vts/radio_ims_test.cpp b/radio/aidl/vts/radio_ims_test.cpp
index e5cbeb4..fb81e05 100644
--- a/radio/aidl/vts/radio_ims_test.cpp
+++ b/radio/aidl/vts/radio_ims_test.cpp
@@ -124,7 +124,7 @@
serial = GetRandomSerialNumber();
ndk::ScopedAStatus res =
- radio_ims->startImsTraffic(serial, std::string("1"),
+ radio_ims->startImsTraffic(serial, 1,
ImsTrafficType::REGISTRATION, AccessNetwork::EUTRAN);
ASSERT_OK(res);
EXPECT_EQ(std::cv_status::no_timeout, wait());
@@ -150,8 +150,7 @@
serial = GetRandomSerialNumber();
- ndk::ScopedAStatus res =
- radio_ims->stopImsTraffic(serial, std::string("2"));
+ ndk::ScopedAStatus res = radio_ims->stopImsTraffic(serial, 2);
ASSERT_OK(res);
EXPECT_EQ(std::cv_status::no_timeout, wait());
EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_ims->rspInfo.type);
diff --git a/radio/aidl/vts/radio_ims_utils.h b/radio/aidl/vts/radio_ims_utils.h
index c981ebc..a435e44 100644
--- a/radio/aidl/vts/radio_ims_utils.h
+++ b/radio/aidl/vts/radio_ims_utils.h
@@ -64,7 +64,7 @@
virtual ~RadioImsIndication() = default;
virtual ndk::ScopedAStatus onConnectionSetupFailure(RadioIndicationType type,
- const std::string& token, const ConnectionFailureInfo& info) override;
+ int32_t token, const ConnectionFailureInfo& info) override;
virtual ndk::ScopedAStatus notifyAnbr(RadioIndicationType type, ImsStreamType mediaType,
ImsStreamDirection direction, int bitsPerSecond) override;