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

Commit 227fe277 authored by sqian's avatar sqian
Browse files

resolve merge conflicts of 6ecc54a7 to stage-aosp-master 

Test: I solemnly swear I tested this conflict resolution.

Change-Id: I369fe9aacf37dcea6225b5e5a658159dfb859ad0
parents 49abbfdd 6ecc54a7

radio/1.0/vts/functional/radio_hidl_hal_misc.cpp

+26 −13
Original line number Diff line number Diff line
@@ -248,7 +248,8 @@ TEST_F(RadioHidlTest, getNeighboringCids) { 
    EXPECT_EQ(serial, radioRsp->rspInfo.serial);



    if (cardStatus.cardState == CardState::ABSENT) {

        ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE);

        ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE ||

                    radioRsp->rspInfo.error == RadioError::SIM_ABSENT);

    }

}
@@ -280,7 +281,8 @@ TEST_F(RadioHidlTest, setCdmaRoamingPreference) { 
    EXPECT_EQ(serial, radioRsp->rspInfo.serial);



    if (cardStatus.cardState == CardState::ABSENT) {

        ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE);

        ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE ||

                    radioRsp->rspInfo.error == RadioError::REQUEST_NOT_SUPPORTED);

    }

}
@@ -345,7 +347,8 @@ TEST_F(RadioHidlTest, setPreferredVoicePrivacy) { 
    EXPECT_EQ(serial, radioRsp->rspInfo.serial);



    if (cardStatus.cardState == CardState::ABSENT) {

        ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE);

        ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE ||

                    radioRsp->rspInfo.error == RadioError::REQUEST_NOT_SUPPORTED);

    }

}
@@ -361,7 +364,8 @@ TEST_F(RadioHidlTest, getPreferredVoicePrivacy) { 
    EXPECT_EQ(serial, radioRsp->rspInfo.serial);



    if (cardStatus.cardState == CardState::ABSENT) {

        ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE);

        ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE ||

                    radioRsp->rspInfo.error == RadioError::REQUEST_NOT_SUPPORTED);

    }

}
@@ -494,7 +498,8 @@ TEST_F(RadioHidlTest, setCellInfoListRate) { 
    EXPECT_EQ(serial, radioRsp->rspInfo.serial);



    if (cardStatus.cardState == CardState::ABSENT) {

        ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE);

        ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE ||

                    radioRsp->rspInfo.error == RadioError::REQUEST_NOT_SUPPORTED);

    }

}
@@ -562,7 +567,8 @@ TEST_F(RadioHidlTest, nvResetConfig) { 
    EXPECT_EQ(serial, radioRsp->rspInfo.serial);



    if (cardStatus.cardState == CardState::ABSENT) {

        ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE);

        ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE ||

                    radioRsp->rspInfo.error == RadioError::REQUEST_NOT_SUPPORTED);

    }

}
@@ -690,7 +696,8 @@ TEST_F(RadioHidlTest, stopLceService) { 


    if (cardStatus.cardState == CardState::ABSENT) {

        ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE ||

                    radioRsp->rspInfo.error == RadioError::LCE_NOT_SUPPORTED);

                    radioRsp->rspInfo.error == RadioError::LCE_NOT_SUPPORTED ||

                    radioRsp->rspInfo.error == RadioError::REQUEST_NOT_SUPPORTED);

    }

}
@@ -723,7 +730,8 @@ TEST_F(RadioHidlTest, getModemActivityInfo) { 
    EXPECT_EQ(serial, radioRsp->rspInfo.serial);



    if (cardStatus.cardState == CardState::ABSENT) {

        ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE);

        ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE ||

                    radioRsp->rspInfo.error == RadioError::REQUEST_NOT_SUPPORTED);

    }

}
@@ -777,7 +785,8 @@ TEST_F(RadioHidlTest, getAllowedCarriers) { 
    EXPECT_EQ(serial, radioRsp->rspInfo.serial);



    if (cardStatus.cardState == CardState::ABSENT) {

        EXPECT_EQ(radioRsp->rspInfo.error, RadioError::NONE);

        ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE ||

                    radioRsp->rspInfo.error == RadioError::REQUEST_NOT_SUPPORTED);

    }

}
@@ -792,9 +801,11 @@ TEST_F(RadioHidlTest, sendDeviceState) { 
    EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type);

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



    std::cout << static_cast<int>(radioRsp->rspInfo.error) << std::endl;



    if (cardStatus.cardState == CardState::ABSENT) {

        ASSERT_TRUE(CheckGeneralError() ||

                    radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS);

        ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE ||

                    radioRsp->rspInfo.error == RadioError::REQUEST_NOT_SUPPORTED);

    }

}
@@ -809,9 +820,11 @@ TEST_F(RadioHidlTest, setIndicationFilter) { 
    EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type);

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



    std::cout << static_cast<int>(radioRsp->rspInfo.error) << std::endl;



    if (cardStatus.cardState == CardState::ABSENT) {

        ASSERT_TRUE(CheckGeneralError() ||

                    radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS);

        ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE ||

                    radioRsp->rspInfo.error == RadioError::REQUEST_NOT_SUPPORTED);

    }

}