Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 11:36:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "VTS: stop network scan once trigger network scan success" into qt-dev

Browse Source 
am: 6a660a6d7b

Change-Id: I20ea717cdfdefb3ec67a1c8cae80b57ea9937217
This commit is contained in:
terrycrhuang
2019-06-19 23:47:55 -07:00
committed by android-build-merger
parent 80962f507e 6a660a6d7b
commit 6e470f1755
3 changed files with 35 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
radio/1.2/vts/functional/radio_hidl_hal_api.cpp
View File

@@ -60,6 +60,11 @@ TEST_F(RadioHidlTest_v1_2, startNetworkScan) {
{RadioError::NONE, RadioError::REQUEST_NOT_SUPPORTED,
RadioError::OPERATION_NOT_ALLOWED}));
}
if (radioRsp_v1_2->rspInfo.error == RadioError::NONE) {
ALOGI("Stop Network Scan");
stopNetworkScan();
}
}
/*

27
radio/1.2/vts/functional/radio_hidl_hal_test.cpp
View File

@@ -14,6 +14,7 @@
* limitations under the License.
*/
#include <android/hardware/radio/1.1/IRadio.h>
#include <radio_hidl_hal_utils_v1_2.h>
void RadioHidlTest_v1_2::SetUp() {
@@ -84,4 +85,28 @@ void RadioHidlTest_v1_2::updateSimCardStatus() {
serial = GetRandomSerialNumber();
radio_v1_2->getIccCardStatus(serial);
EXPECT_EQ(std::cv_status::no_timeout, wait());
}
}
void RadioHidlTest_v1_2::stopNetworkScan() {
sp<::android::hardware::radio::V1_1::IRadio> radio_v1_1;
radio_v1_1 = ::testing::VtsHalHidlTargetTestBase::getService<
::android::hardware::radio::V1_1::IRadio>(
RadioHidlEnvironment::Instance()
->getServiceName<::android::hardware::radio::V1_1::IRadio>(
hidl_string(RADIO_SERVICE_NAME)));
if (radio_v1_1 == NULL) {
sleep(60);
radio_v1_1 = ::testing::VtsHalHidlTargetTestBase::getService<
::android::hardware::radio::V1_1::IRadio>(
RadioHidlEnvironment::Instance()
->getServiceName<::android::hardware::radio::V1_1::IRadio>(
hidl_string(RADIO_SERVICE_NAME)));
}
ASSERT_NE(nullptr, radio_v1_1.get());
serial = GetRandomSerialNumber();
radio_v1_1->stopNetworkScan(serial);
EXPECT_EQ(std::cv_status::no_timeout, wait());
}

5
radio/1.2/vts/functional/radio_hidl_hal_utils_v1_2.h
View File

@@ -622,7 +622,10 @@ class RadioHidlTest_v1_2 : public ::testing::VtsHalHidlTargetTestBase {
/* Update Sim Card Status */
void updateSimCardStatus();
public:
/* Stop Network Scan Command */
void stopNetworkScan();
public:
virtual void SetUp() override;
/* Used as a mechanism to inform the test about data/event callback */