commit f88933b02edebd12dc72829711455d2e810d23d2
author Nagendra Prasad Nagarle Basavaraju <nagendranb@google.com> Wed Dec 06 00:20:58 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Dec 06 00:20:58 2023 +0000
tree 7c63c936428fdff3f141c839db298dd5d34944f2
parent 6c13a980f0b03910648a94df233676c135c6eb99
parent 378bd90e6615a1381e3dbab12739c8a329e1d962

[DO NOT MERGE] VTS setGetAllowedNetworkTypesBitmap handle "LTE + LTE_CA" response am: 378bd90e66

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2858865

Change-Id: I8b42520d708b51f6e23c28de9b29567f303ea067
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

radio/aidl/vts/radio_network_test.cpp

diff --git a/radio/aidl/vts/radio_network_test.cpp b/radio/aidl/vts/radio_network_test.cpp
index 54250b0..00fa3fb 100644
--- a/radio/aidl/vts/radio_network_test.cpp
+++ b/radio/aidl/vts/radio_network_test.cpp
@@ -85,6 +85,11 @@
 TEST_P(RadioNetworkTest, setGetAllowedNetworkTypesBitmap) {
     serial = GetRandomSerialNumber();
 
+    // get aidl version
+    int32_t aidl_version;
+    ndk::ScopedAStatus aidl_status = radio_network->getInterfaceVersion(&aidl_version);
+    ASSERT_OK(aidl_status);
+
     // save current value
     radio_network->getAllowedNetworkTypesBitmap(serial);
     EXPECT_EQ(std::cv_status::no_timeout, wait());
@@ -120,6 +125,11 @@
                  RadioError::INVALID_ARGUMENTS, RadioError::MODEM_ERR,
                  RadioError::REQUEST_NOT_SUPPORTED, RadioError::NO_RESOURCES}));
         if (radioRsp_network->rspInfo.error == RadioError::NONE) {
+            if (aidl_version < 2) {
+                radioRsp_network->networkTypeBitmapResponse
+                    &= ~static_cast<int32_t>(RadioAccessFamily::LTE_CA);
+            }
+
             // verify we get the value we set
             ASSERT_EQ(radioRsp_network->networkTypeBitmapResponse, allowedNetworkTypesBitmap);
         }