commit 6391202a3bdbeccc12b5eb2553ac0ba575131d2d
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Dec 08 18:06:58 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Dec 08 18:06:58 2023 +0000
tree 45783151bad13b9a181684752c0a42112054abfd
parent 7515208119cb54d5939b0ef7c2db272ab21434df
parent 3e059d73d84465abccfa879905652f1357c90ffc

Merge "Merge "Replace secretkeeper_comm_nostd->secretkeeper_core_nostd" into main am: 05585eb79a am: 98c6489cb6 am: 5f78924966" into main

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 a6ee2a6..32b246a 100644
--- a/radio/aidl/vts/radio_network_test.cpp
+++ b/radio/aidl/vts/radio_network_test.cpp
@@ -90,6 +90,11 @@
 
     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());
@@ -125,6 +130,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
             EXPECT_EQ(radioRsp_network->networkTypeBitmapResponse, allowedNetworkTypesBitmap);
         }