commit 49b81dd647f94a7c7a7aa809d5c1464aae694f9e
author Hunsuk Choi <forestchoi@google.com> Tue Nov 01 06:23:18 2022 +0000
committer Hunsuk Choi <forestchoi@google.com> Wed Nov 02 23:21:35 2022 +0000
tree 8e8c4280e1430e8a619ed214539aad4121f5f4f8
parent eaa8469b7c95920d5626427747986bc4c8569f78

Change the type of token of startImsTraffic from String to int

Bug: 219242095
Test: atest VtsHalRadioTargetTest
Change-Id: Ie9584fb10111f480e89a0119d17407e76d39fd89

radio/aidl/vts/radio_ims_indication.cpp

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
+}

radio/aidl/vts/radio_ims_test.cpp

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);

radio/aidl/vts/radio_ims_utils.h

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;