summaryrefslogtreecommitdiffstats
path: root/sensors/common
diff options
context:
space:
mode:
authorBrian Stack <bstack@google.com>2018-10-09 09:56:03 -0700
committerBrian Stack <bstack@google.com>2018-10-15 15:19:03 -0700
commitb6962f6e7db2053545b726b535477d023d2e78aa (patch)
tree77f6e2ff459e6f4b753a8262cb0cc2d6d8a72ab6 /sensors/common
parentb132d0c2ef6f514158138a870a93353b76f95f09 (diff)
downloadandroid_hardware_interfaces-b6962f6e7db2053545b726b535477d023d2e78aa.tar.gz
android_hardware_interfaces-b6962f6e7db2053545b726b535477d023d2e78aa.tar.bz2
android_hardware_interfaces-b6962f6e7db2053545b726b535477d023d2e78aa.zip
Copy Sensors VTS 1.0 into 2.0
Copy the VTS tests for Sensors 1.0 into the 2.0 directory to provide a starting point for 2.0 tests. Updates references to 2.0 from 1.0 where necessary. Bug: 115969174 Test: Builds Change-Id: Ia385552c208087175272627c65b9096cdb8f4afa
Diffstat (limited to 'sensors/common')
-rw-r--r--sensors/common/vts/utils/SensorsHidlTestBase.cpp3
-rw-r--r--sensors/common/vts/utils/include/sensors-vts-utils/SensorsHidlTestBase.h13
2 files changed, 14 insertions, 2 deletions
diff --git a/sensors/common/vts/utils/SensorsHidlTestBase.cpp b/sensors/common/vts/utils/SensorsHidlTestBase.cpp
index 8497d824d..b72fdfd53 100644
--- a/sensors/common/vts/utils/SensorsHidlTestBase.cpp
+++ b/sensors/common/vts/utils/SensorsHidlTestBase.cpp
@@ -29,7 +29,8 @@ using ::android::sp;
using ::android::hardware::hidl_string;
using ::android::hardware::Return;
using ::android::hardware::Void;
-using namespace ::android::hardware::sensors::V1_0;
+using ::android::hardware::sensors::V1_0::SensorFlagShift;
+using ::android::hardware::sensors::V1_0::SensorsEventFormatOffset;
const Vec3NormChecker SensorsHidlTestBase::sAccelNormChecker(
Vec3NormChecker::byNominal(GRAVITY_EARTH, 1.0f /*m/s^2*/));
diff --git a/sensors/common/vts/utils/include/sensors-vts-utils/SensorsHidlTestBase.h b/sensors/common/vts/utils/include/sensors-vts-utils/SensorsHidlTestBase.h
index 405dc2838..f4b259f62 100644
--- a/sensors/common/vts/utils/include/sensors-vts-utils/SensorsHidlTestBase.h
+++ b/sensors/common/vts/utils/include/sensors-vts-utils/SensorsHidlTestBase.h
@@ -31,7 +31,18 @@ using ::android::sp;
using ::android::hardware::hidl_string;
using ::android::hardware::Return;
using ::android::hardware::Void;
-using namespace ::android::hardware::sensors::V1_0;
+
+using ::android::sp;
+using ::android::hardware::hidl_string;
+using ::android::hardware::sensors::V1_0::Event;
+using ::android::hardware::sensors::V1_0::ISensors;
+using ::android::hardware::sensors::V1_0::RateLevel;
+using ::android::hardware::sensors::V1_0::Result;
+using ::android::hardware::sensors::V1_0::SensorFlagBits;
+using ::android::hardware::sensors::V1_0::SensorInfo;
+using ::android::hardware::sensors::V1_0::SensorType;
+using ::android::hardware::sensors::V1_0::SharedMemInfo;
+using ::android::hardware::sensors::V1_0::SharedMemType;
class SensorsHidlTestBase : public ::testing::VtsHalHidlTargetTestBase {
public: