From 378bd90e6615a1381e3dbab12739c8a329e1d962 Mon Sep 17 00:00:00 2001
From: Nagendra Prasad Nagarle Basavaraju <nagendranb@google.com>
Date: Mon, 4 Dec 2023 03:55:30 +0000
Subject: [PATCH] [DO NOT MERGE] VTS setGetAllowedNetworkTypesBitmap handle
 "LTE + LTE_CA" response

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

Bug: 308538353
Test: atest VtsHalRadioTargetTest , Device test @ b/308538353#comment29
Change-Id: I1916422c88ac6dad4a9d0777b32182b599e9c30c
---
 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 54250b07a8..00fa3fb885 100644
--- a/radio/aidl/vts/radio_network_test.cpp
+++ b/radio/aidl/vts/radio_network_test.cpp
@@ -85,6 +85,11 @@ void RadioNetworkTest::stopNetworkScan() {
 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 @@ 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
             ASSERT_EQ(radioRsp_network->networkTypeBitmapResponse, allowedNetworkTypesBitmap);
         }