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

Commit 3b073bcb authored by Sanket Padawe's avatar Sanket Padawe Committed by android-build-merger
Browse files

Merge "Fix more radio VTS test." into oc-dev am: 3cc7c4e3 

am: 29687c4b

Change-Id: I2c676fd849b1a18c0dfe6a46fd2ef35067643d64
parents 54c60b34 29687c4b

radio/1.0/vts/functional/radio_hidl_hal_misc.cpp

+8 −6
Original line number Diff line number Diff line
@@ -143,15 +143,17 @@ TEST_F(RadioHidlTest, getAvailableNetworks) { 


  radio->getAvailableNetworks(++serial);

  EXPECT_EQ(std::cv_status::no_timeout, wait());

  EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type);

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

  ASSERT_TRUE(radioRsp->rspInfo.type == RadioResponseType::SOLICITED ||

              radioRsp->rspInfo.type == RadioResponseType::SOLICITED_ACK_EXP);



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

      ASSERT_TRUE(CheckGeneralError() ||

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

      ASSERT_TRUE(

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

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

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

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

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

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

  }

}

radio/1.0/vts/functional/radio_hidl_hal_utils.h

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ using ::android::hardware::Return; 
using ::android::hardware::Void;

using ::android::sp;



#define TIMEOUT_PERIOD 40

#define TIMEOUT_PERIOD 65

#define RADIO_SERVICE_NAME "slot1"



class RadioHidlTest;