summaryrefslogtreecommitdiffstats
path: root/tv
diff options
context:
space:
mode:
authorDan Shi <dshi@google.com>2020-04-07 14:38:56 -0700
committerDan Shi <dshi@google.com>2020-04-13 23:15:50 -0700
commitfdbc494c694240b3d1169d35f6c8c74089d775d5 (patch)
treec02026dfc421c253916cb76e0bd44a6bf2230e71 /tv
parent62bc360c113b6ef2c8b9e684f02a33b5c1ee2cad (diff)
downloadplatform_hardware_interfaces-fdbc494c694240b3d1169d35f6c8c74089d775d5.tar.gz
platform_hardware_interfaces-fdbc494c694240b3d1169d35f6c8c74089d775d5.tar.bz2
platform_hardware_interfaces-fdbc494c694240b3d1169d35f6c8c74089d775d5.zip
Remove references of VtsHalHidlTargetTestBase
Bug: 147894326 Test: build Change-Id: If847cc3aa5bb17682b92266f5460efe9d3fadfab
Diffstat (limited to 'tv')
-rw-r--r--tv/tuner/1.0/vts/functional/DemuxTests.h4
-rw-r--r--tv/tuner/1.0/vts/functional/FilterTests.h6
-rw-r--r--tv/tuner/1.0/vts/functional/FrontendTests.h4
-rw-r--r--tv/tuner/1.0/vts/functional/VtsHalTvTunerV1_0TestConfigurations.h2
4 files changed, 8 insertions, 8 deletions
diff --git a/tv/tuner/1.0/vts/functional/DemuxTests.h b/tv/tuner/1.0/vts/functional/DemuxTests.h
index f405a79ae8..a72c09fd0c 100644
--- a/tv/tuner/1.0/vts/functional/DemuxTests.h
+++ b/tv/tuner/1.0/vts/functional/DemuxTests.h
@@ -14,8 +14,6 @@
* limitations under the License.
*/
-#include <VtsHalHidlTargetTestBase.h>
-#include <VtsHalHidlTargetTestEnvBase.h>
#include <android-base/logging.h>
#include <android/hardware/tv/tuner/1.0/IDemux.h>
#include <android/hardware/tv/tuner/1.0/ITuner.h>
@@ -54,4 +52,4 @@ class DemuxTests {
static AssertionResult success() { return ::testing::AssertionSuccess(); }
sp<IDemux> mDemux;
-}; \ No newline at end of file
+};
diff --git a/tv/tuner/1.0/vts/functional/FilterTests.h b/tv/tuner/1.0/vts/functional/FilterTests.h
index eab963bc34..3cc06e578d 100644
--- a/tv/tuner/1.0/vts/functional/FilterTests.h
+++ b/tv/tuner/1.0/vts/functional/FilterTests.h
@@ -14,8 +14,6 @@
* limitations under the License.
*/
-#include <VtsHalHidlTargetTestBase.h>
-#include <VtsHalHidlTargetTestEnvBase.h>
#include <android-base/logging.h>
#include <android/hardware/tv/tuner/1.0/IFilter.h>
#include <android/hardware/tv/tuner/1.0/IFilterCallback.h>
@@ -64,6 +62,8 @@ using android::hardware::tv::tuner::V1_0::Result;
using ::testing::AssertionResult;
+using namespace std;
+
enum FilterEventType : uint8_t {
UNDEFINED,
SECTION,
@@ -223,4 +223,4 @@ class FilterTests {
vector<uint32_t> mUsedFilterIds;
uint32_t mFilterId = -1;
-}; \ No newline at end of file
+};
diff --git a/tv/tuner/1.0/vts/functional/FrontendTests.h b/tv/tuner/1.0/vts/functional/FrontendTests.h
index 701be826d5..1a9bec9627 100644
--- a/tv/tuner/1.0/vts/functional/FrontendTests.h
+++ b/tv/tuner/1.0/vts/functional/FrontendTests.h
@@ -14,8 +14,6 @@
* limitations under the License.
*/
-#include <VtsHalHidlTargetTestBase.h>
-#include <VtsHalHidlTargetTestEnvBase.h>
#include <android-base/logging.h>
#include <android/hardware/tv/tuner/1.0/IFrontend.h>
#include <android/hardware/tv/tuner/1.0/IFrontendCallback.h>
@@ -66,6 +64,8 @@ using android::hardware::tv::tuner::V1_0::Result;
using ::testing::AssertionResult;
+using namespace std;
+
#define INVALID_ID -1
#define WAIT_TIMEOUT 3000000000
diff --git a/tv/tuner/1.0/vts/functional/VtsHalTvTunerV1_0TestConfigurations.h b/tv/tuner/1.0/vts/functional/VtsHalTvTunerV1_0TestConfigurations.h
index 10c60142ba..538773a209 100644
--- a/tv/tuner/1.0/vts/functional/VtsHalTvTunerV1_0TestConfigurations.h
+++ b/tv/tuner/1.0/vts/functional/VtsHalTvTunerV1_0TestConfigurations.h
@@ -38,6 +38,8 @@ using android::hardware::tv::tuner::V1_0::FrontendDvbtTransmissionMode;
using android::hardware::tv::tuner::V1_0::FrontendSettings;
using android::hardware::tv::tuner::V1_0::FrontendType;
+using namespace std;
+
typedef enum {
TS_VIDEO0,
TS_VIDEO1,