commit 770b25abd09d9e674b14c3b6feecd80ce0216ae1
author Hsin-Yi Chen <hsinyichen@google.com> Mon Aug 20 11:14:25 2018 -0700
committer android-build-merger <android-build-merger@google.com> Mon Aug 20 11:14:25 2018 -0700
tree df1ace60026ca1e67157b750acb29a81d0f3a56e
parent 997fb4631ef2f71cf1435a34ed2960d6fcff31af
parent a73a8c9b2bab1c45637d842cc93f9cff8e980582

Merge "Fix base class of WifiHidlEnvironment_1_2" into pie-vts-dev
am: a73a8c9b2b

Change-Id: I18081c95710d4d505991628994df7a9ebbdc99df

wifi/1.2/vts/functional/VtsHalWifiV1_2TargetTest.cpp

diff --git a/wifi/1.2/vts/functional/VtsHalWifiV1_2TargetTest.cpp b/wifi/1.2/vts/functional/VtsHalWifiV1_2TargetTest.cpp
index cfad208..c765cdc 100644
--- a/wifi/1.2/vts/functional/VtsHalWifiV1_2TargetTest.cpp
+++ b/wifi/1.2/vts/functional/VtsHalWifiV1_2TargetTest.cpp
@@ -17,14 +17,12 @@
 #include <android-base/logging.h>
 #include <android/hardware/wifi/1.2/IWifi.h>
 
-#include <VtsHalHidlTargetTestEnvBase.h>
-
 #include "wifi_hidl_test_utils.h"
 
 using ::android::hardware::wifi::V1_2::IWifi;
 
 // Test environment for Wifi HIDL HAL.
-class WifiHidlEnvironment_1_2 : public ::testing::VtsHalHidlTargetTestEnvBase {
+class WifiHidlEnvironment_1_2 : public WifiHidlEnvironment {
    public:
     // get the test environment singleton
     static WifiHidlEnvironment_1_2* Instance() {