commit b04cc8c52c86380043e5cfa0070c6de13290f788
author Willy Hu <willycwhu@google.com> Thu Jul 04 04:48:54 2019 -0700
committer android-build-merger <android-build-merger@google.com> Thu Jul 04 04:48:54 2019 -0700
tree ce9ac0f2f257d7ec9b237cb5ddf2a642bff29904
parent 5379aaf91b889ffafea1c849e6e641dd2887ee5a
parent 39c6e3a9e7837bb3e912a1959ae0f217e296edc4

Merge "VTS: Change stopNetworkScan from 1_1 to 1_2" into qt-r1-dev am: 1b1c6e42c9
am: 39c6e3a9e7

Change-Id: Id41b727f96f78ab127d0ae71b4fe4510c69d466c

radio/1.2/vts/functional/radio_hidl_hal_test.cpp

diff --git a/radio/1.2/vts/functional/radio_hidl_hal_test.cpp b/radio/1.2/vts/functional/radio_hidl_hal_test.cpp
index bff7481..6b84810 100644
--- a/radio/1.2/vts/functional/radio_hidl_hal_test.cpp
+++ b/radio/1.2/vts/functional/radio_hidl_hal_test.cpp
@@ -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::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());
 }