Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5e0ab84b authored by Nathan Harold's avatar Nathan Harold Committed by Automerger Merge Worker
Browse files

Merge "Allow Unsupported BarringInfo in RVC for Radio 1.5" into rvc-dev am:... 

Merge "Allow Unsupported BarringInfo in RVC for Radio 1.5" into rvc-dev am: facdb89f am: 92cccea0

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

Change-Id: I0251d906f56d11470cf32ac3018e1603823663ff
parents 395370c8 92cccea0

radio/1.5/vts/functional/radio_hidl_hal_api.cpp

+12 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
 * limitations under the License.

 */



#include <android-base/properties.h>

#include <radio_hidl_hal_utils_v1_5.h>



#define ASSERT_OK(ret) ASSERT_TRUE(ret.isOk())
@@ -1174,6 +1175,17 @@ TEST_P(RadioHidlTest_v1_5, getBarringInfo) { 
    EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_v1_5->rspInfo.type);

    EXPECT_EQ(serial, radioRsp_v1_5->rspInfo.serial);



    int32_t firstApiLevel = android::base::GetIntProperty<int32_t>("ro.product.first_api_level", 0);

    // Allow devices shipping with Radio::1_5 and Android 11 to not support barring info.

    if (firstApiLevel > 0 && firstApiLevel <= 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.

        if (radioRsp_v1_5->rspInfo.error != RadioError::NONE) {

            return;

        }

    }



    ASSERT_TRUE(radioRsp_v1_5->barringInfos.size() > 0);



    std::set<BarringInfo::ServiceType> reportedServices;