commit abf00a93096056f10149bfc5a98402d4c49a8c4e
author Sneh Bansal <quic_snehb@quicinc.com> Wed Jan 12 20:23:57 2022 +0530
committer Nathan Harold <nharold@google.com> Thu Jan 13 22:32:33 2022 +0000
tree daa950183b2acc414fbe98f29e4f97c1753d402f
parent 2d2c69d21f2d5990efb15cef6e812106e4a9c22f

VTS: Check for "ro.board.first_api_level" in GetBarringInfo()

Some GRF targets launched with S release do not support getBarringInfo()
API.

Check "ro.board.first_api_level" also to return from the test-case
when the response is REQUEST_NOT_SUPPORTED.

Bug: 212384410
Merged-In: I890f54f80ff3aca3dcb2c51f20db087d453c2927
Change-Id: I890f54f80ff3aca3dcb2c51f20db087d453c2927
(cherry picked from commit becb08fac072a2d5bb18bfaafc61f86e2107fffa)

radio/1.5/vts/functional/radio_hidl_hal_api.cpp

diff --git a/radio/1.5/vts/functional/radio_hidl_hal_api.cpp b/radio/1.5/vts/functional/radio_hidl_hal_api.cpp
index d108951..152858f 100644
--- a/radio/1.5/vts/functional/radio_hidl_hal_api.cpp
+++ b/radio/1.5/vts/functional/radio_hidl_hal_api.cpp
@@ -1271,8 +1271,12 @@
     EXPECT_EQ(serial, radioRsp_v1_5->rspInfo.serial);
 
     int32_t firstApiLevel = android::base::GetIntProperty<int32_t>("ro.product.first_api_level", 0);
+    int32_t boardApiLevel = android::base::GetIntProperty<int32_t>("ro.board.first_api_level", 0);
     // Allow devices shipping with Radio::1_5 and Android 11 to not support barring info.
-    if (firstApiLevel > 0 && firstApiLevel <= 30) {
+    // b/212384410 Some GRF targets lauched with S release but with vendor R release
+    // do not support getBarringInfo API. Allow these devices to not support barring info.
+    if ((firstApiLevel > 0 && firstApiLevel <= 30) ||
+        (boardApiLevel > 0 && boardApiLevel <= 30)) {
         ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_5->rspInfo.error,
                                      {RadioError::NONE, RadioError::REQUEST_NOT_SUPPORTED}));
         // Early exit for devices that don't support barring info.