commit c112be137e9ef17940a1c9538016a42ab813c457
author Helen <helenhykim@google.com> Tue Apr 26 01:02:40 2022 +0000
committer Helen <helenhykim@google.com> Wed Apr 27 06:59:15 2022 +0000
tree 50eb3aa5ac18732daf1749f6f3f5113bcc156ffa
parent 4489648e3aad91fc86b0f1abadff3db5cbbcd70c

Update ANBR Apis
- remove setAnbrEnabled and setAnbrEnabledResponse
- change qosSessionId to mediaType

Bug: 224905346
Test: Build
Change-Id: I2e944c8068b26727d4c437c1f5aa38d1fb79b034

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 9c821ff..0637813 100644
--- a/radio/aidl/vts/radio_ims_indication.cpp
+++ b/radio/aidl/vts/radio_ims_indication.cpp
@@ -24,7 +24,7 @@
 }
 
 ndk::ScopedAStatus RadioImsIndication::notifyAnbr(RadioIndicationType /*type*/,
-        int /*qosSessionId*/, ImsStreamDirection /*direction*/, int /*bitsPerSecond*/) {
+        ImsStreamType /*mediaType*/, ImsStreamDirection /*direction*/, int /*bitsPerSecond*/) {
     return ndk::ScopedAStatus::ok();
 }
 

radio/aidl/vts/radio_ims_response.cpp

diff --git a/radio/aidl/vts/radio_ims_response.cpp b/radio/aidl/vts/radio_ims_response.cpp
index fa34dc1..7a90ebd 100644
--- a/radio/aidl/vts/radio_ims_response.cpp
+++ b/radio/aidl/vts/radio_ims_response.cpp
@@ -45,12 +45,6 @@
     return ndk::ScopedAStatus::ok();
 }
 
-ndk::ScopedAStatus RadioImsResponse::setAnbrEnabledResponse(const RadioResponseInfo& info) {
-    rspInfo = info;
-    parent_ims.notify(info.serial);
-    return ndk::ScopedAStatus::ok();
-}
-
 ndk::ScopedAStatus RadioImsResponse::sendAnbrQueryResponse(const RadioResponseInfo& info) {
     rspInfo = info;
     parent_ims.notify(info.serial);

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 84b7c6a..d3bdd4b 100644
--- a/radio/aidl/vts/radio_ims_test.cpp
+++ b/radio/aidl/vts/radio_ims_test.cpp
@@ -164,32 +164,6 @@
 }
 
 /*
- * Test IRadioIms.setAnbrEnabled() for the response returned.
- */
-TEST_P(RadioImsTest, setAnbrEnabled) {
-    if (!deviceSupportsFeature(FEATURE_TELEPHONY_IMS)) {
-        ALOGI("Skipping setAnbrEnabled because ims is not supported in device");
-        return;
-    } else {
-        ALOGI("Running setAnbrEnabled because ims is supported in device");
-    }
-
-    serial = GetRandomSerialNumber();
-
-    ndk::ScopedAStatus res =
-            radio_ims->setAnbrEnabled(serial, 1, true);
-    ASSERT_OK(res);
-    EXPECT_EQ(std::cv_status::no_timeout, wait());
-    EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_ims->rspInfo.type);
-    EXPECT_EQ(serial, radioRsp_ims->rspInfo.serial);
-
-    ALOGI("setAnbrEnabled, rspInfo.error = %s\n",
-              toString(radioRsp_ims->rspInfo.error).c_str());
-
-    verifyError(radioRsp_ims->rspInfo.error);
-}
-
-/*
  * Test IRadioIms.sendAnbrQuery() for the response returned.
  */
 TEST_P(RadioImsTest, sendAnbrQuery) {
@@ -203,7 +177,7 @@
     serial = GetRandomSerialNumber();
 
     ndk::ScopedAStatus res =
-            radio_ims->sendAnbrQuery(serial, 1, ImsStreamDirection::UPLINK, 13200);
+            radio_ims->sendAnbrQuery(serial, ImsStreamType::AUDIO, ImsStreamDirection::UPLINK, 13200);
     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 2967476..c9ecf4a 100644
--- a/radio/aidl/vts/radio_ims_utils.h
+++ b/radio/aidl/vts/radio_ims_utils.h
@@ -48,8 +48,6 @@
 
     virtual ndk::ScopedAStatus stopImsTrafficResponse(const RadioResponseInfo& info) override;
 
-    virtual ndk::ScopedAStatus setAnbrEnabledResponse(const RadioResponseInfo& info) override;
-
     virtual ndk::ScopedAStatus sendAnbrQueryResponse(const RadioResponseInfo& info) override;
 };
 
@@ -65,7 +63,7 @@
     virtual ndk::ScopedAStatus onConnectionSetupFailure(RadioIndicationType type,
             const std::string& token, const ConnectionFailureInfo& info) override;
 
-    virtual ndk::ScopedAStatus notifyAnbr(RadioIndicationType type, int qosSessionId,
+    virtual ndk::ScopedAStatus notifyAnbr(RadioIndicationType type, ImsStreamType mediaType,
             ImsStreamDirection direction, int bitsPerSecond) override;
 
     virtual ndk::ScopedAStatus triggerImsDeregistration(RadioIndicationType type) override;