diff options
| author | Jordan Liu <jminjie@google.com> | 2020-06-12 14:43:22 -0700 |
|---|---|---|
| committer | Jordan Liu <jminjie@google.com> | 2020-06-12 14:43:22 -0700 |
| commit | 9ed871fc20319dc7c7c17864cd1acbb2d4792273 (patch) | |
| tree | b502013b4489c58401c4b55547dd0b53098f102e /radio | |
| parent | 744b02880730ffcb1cf4dade6269e81819a4a5ba (diff) | |
| download | platform_hardware_interfaces-9ed871fc20319dc7c7c17864cd1acbb2d4792273.tar.gz platform_hardware_interfaces-9ed871fc20319dc7c7c17864cd1acbb2d4792273.tar.bz2 platform_hardware_interfaces-9ed871fc20319dc7c7c17864cd1acbb2d4792273.zip | |
Fix bad merge of aosp/1220298
Bug: 158872011
Test: atest
Change-Id: Ife92d607df5442febab86ed61c3edc24d904b36b
Diffstat (limited to 'radio')
| -rw-r--r-- | radio/1.1/vts/functional/radio_hidl_hal_api.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/radio/1.1/vts/functional/radio_hidl_hal_api.cpp b/radio/1.1/vts/functional/radio_hidl_hal_api.cpp index 02dcbab20d..08121fde2b 100644 --- a/radio/1.1/vts/functional/radio_hidl_hal_api.cpp +++ b/radio/1.1/vts/functional/radio_hidl_hal_api.cpp @@ -49,7 +49,6 @@ TEST_P(RadioHidlTest_v1_1, setSimCardPower_1_1) { } EXPECT_EQ(CardState::ABSENT, cardStatus.cardState); } -#endif /* Test setSimCardPower power up */ serial = GetRandomSerialNumber(); @@ -60,6 +59,7 @@ TEST_P(RadioHidlTest_v1_1, setSimCardPower_1_1) { ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_1->rspInfo.error, {RadioError::NONE, RadioError::REQUEST_NOT_SUPPORTED, RadioError::INVALID_ARGUMENTS, RadioError::RADIO_NOT_AVAILABLE})); +#endif /** * If the sim card status for the testing environment is PRESENT, |