From 307691384fabb5b9d7ffe3f9b435ccb992eea10c Mon Sep 17 00:00:00 2001
From: Nagendra Prasad Nagarle Basavaraju <nagendranb@google.com>
Date: Tue, 5 Dec 2023 03:10:04 +0000
Subject: [PATCH] VTS setGetAllowedNetworkTypesBitmap handle "LTE + LTE_CA"
 response

Handle RIL reporting response for getAllowedNetworkTypesBitmap() with
"LTE + LTE_CA" until Android T.

Bug: 308538353
Test: atest VtsHalRadioTargetTest
Change-Id: I32242dff1ab7f2f1923674e7880b547f6e55de93
---
 radio/aidl/vts/radio_network_test.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/radio/aidl/vts/radio_network_test.cpp b/radio/aidl/vts/radio_network_test.cpp
index a6ee2a68e6..32b246aa44 100644
--- a/radio/aidl/vts/radio_network_test.cpp
+++ b/radio/aidl/vts/radio_network_test.cpp
@@ -90,6 +90,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());
@@ -125,6 +130,11 @@ TEST_P(RadioNetworkTest, setGetAllowedNetworkTypesBitmap) {
                  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);
         }