summaryrefslogtreecommitdiffstats
path: root/wifi
diff options
context:
space:
mode:
authorHsin-Yi Chen2018-08-20 13:14:25 -0500
committerandroid-build-merger2018-08-20 13:14:25 -0500
commit770b25abd09d9e674b14c3b6feecd80ce0216ae1 (patch)
treedf1ace60026ca1e67157b750acb29a81d0f3a56e /wifi
parent997fb4631ef2f71cf1435a34ed2960d6fcff31af (diff)
parenta73a8c9b2bab1c45637d842cc93f9cff8e980582 (diff)
downloadplatform-hardware-interfaces-770b25abd09d9e674b14c3b6feecd80ce0216ae1.tar.gz
platform-hardware-interfaces-770b25abd09d9e674b14c3b6feecd80ce0216ae1.tar.xz
platform-hardware-interfaces-770b25abd09d9e674b14c3b6feecd80ce0216ae1.zip
Merge "Fix base class of WifiHidlEnvironment_1_2" into pie-vts-dev
am: a73a8c9b2b Change-Id: I18081c95710d4d505991628994df7a9ebbdc99df
Diffstat (limited to 'wifi')
-rw-r--r--wifi/1.2/vts/functional/VtsHalWifiV1_2TargetTest.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/wifi/1.2/vts/functional/VtsHalWifiV1_2TargetTest.cpp b/wifi/1.2/vts/functional/VtsHalWifiV1_2TargetTest.cpp
index cfad2082..c765cdcc 100644
--- a/wifi/1.2/vts/functional/VtsHalWifiV1_2TargetTest.cpp
+++ b/wifi/1.2/vts/functional/VtsHalWifiV1_2TargetTest.cpp
@@ -17,14 +17,12 @@
17#include <android-base/logging.h> 17#include <android-base/logging.h>
18#include <android/hardware/wifi/1.2/IWifi.h> 18#include <android/hardware/wifi/1.2/IWifi.h>
19 19
20#include <VtsHalHidlTargetTestEnvBase.h>
21
22#include "wifi_hidl_test_utils.h" 20#include "wifi_hidl_test_utils.h"
23 21
24using ::android::hardware::wifi::V1_2::IWifi; 22using ::android::hardware::wifi::V1_2::IWifi;
25 23
26// Test environment for Wifi HIDL HAL. 24// Test environment for Wifi HIDL HAL.
27class WifiHidlEnvironment_1_2 : public ::testing::VtsHalHidlTargetTestEnvBase { 25class WifiHidlEnvironment_1_2 : public WifiHidlEnvironment {
28 public: 26 public:
29 // get the test environment singleton 27 // get the test environment singleton
30 static WifiHidlEnvironment_1_2* Instance() { 28 static WifiHidlEnvironment_1_2* Instance() {