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

Commit 62b3ba25 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6630650 from 0f307128 to mainline-release

Change-Id: Id3c963be8129932fd88e44c1247b78dfe4b9a3c2
parents 3ef7b8fb 0f307128
Loading
Loading
Loading
Loading
+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;