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: Change stopNetworkScan from 1_1 to 1_2" into qt-r1-dev am: 1b1c6e42c9

Browse Source 
am: 39c6e3a9e7

Change-Id: Id41b727f96f78ab127d0ae71b4fe4510c69d466c
This commit is contained in:
Willy Hu
2019-07-04 04:48:54 -07:00
committed by android-build-merger
parent 5379aaf91b 39c6e3a9e7
commit b04cc8c52c
1 changed files with 1 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,7 +14,6 @@
* 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() {
@@ -88,25 +87,7 @@ void RadioHidlTest_v1_2::updateSimCardStatus() {
}
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);
radio_v1_2->stopNetworkScan(serial);
EXPECT_EQ(std::cv_status::no_timeout, wait());
}