diff options
author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-01-31 22:52:32 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-01-31 22:52:32 +0000 |
commit | 42b2f781be8d965920826d12ee464d1238aed8ec (patch) | |
tree | f3d55a2d56bb97092407df21213b63c565840299 | |
parent | 119b9ea01dbe581a25f42d18057e2283046e7ff2 (diff) | |
parent | 984b3069bc9b77ad400af47ba60f860e77f5638d (diff) | |
download | android_hardware_interfaces-42b2f781be8d965920826d12ee464d1238aed8ec.tar.gz android_hardware_interfaces-42b2f781be8d965920826d12ee464d1238aed8ec.tar.bz2 android_hardware_interfaces-42b2f781be8d965920826d12ee464d1238aed8ec.zip |
VTS: only assert that IGnssDebug present for non-automotive am: 2fd5c7cdf9 am: 984b3069bc
Change-Id: I4694449509de580da4049cef13458d35aed117af
-rw-r--r-- | gnss/1.0/vts/functional/VtsHalGnssV1_0TargetTest.cpp | 14 | ||||
-rw-r--r-- | gnss/1.1/vts/functional/gnss_hal_test_cases.cpp | 9 |
2 files changed, 19 insertions, 4 deletions
diff --git a/gnss/1.0/vts/functional/VtsHalGnssV1_0TargetTest.cpp b/gnss/1.0/vts/functional/VtsHalGnssV1_0TargetTest.cpp index c26f60a70..0541c9038 100644 --- a/gnss/1.0/vts/functional/VtsHalGnssV1_0TargetTest.cpp +++ b/gnss/1.0/vts/functional/VtsHalGnssV1_0TargetTest.cpp @@ -25,6 +25,8 @@ #include <condition_variable> #include <mutex> +#include <cutils/properties.h> + using android::hardware::Return; using android::hardware::Void; @@ -36,6 +38,12 @@ using android::hardware::gnss::V1_0::IGnssDebug; using android::hardware::gnss::V1_0::IGnssMeasurement; using android::sp; +static bool IsAutomotiveDevice() { + char buffer[PROPERTY_VALUE_MAX] = {0}; + property_get("ro.hardware.type", buffer, ""); + return strncmp(buffer, "automotive", PROPERTY_VALUE_MAX) == 0; +} + #define TIMEOUT_SEC 2 // for basic commands/responses // for command line argument on how strictly to run the test @@ -460,9 +468,9 @@ TEST_F(GnssHalTest, GetAllExtensions) { auto gnssDebug = gnss_hal_->getExtensionGnssDebug(); ASSERT_TRUE(gnssDebug.isOk()); - if (info_called_count_ > 0 && last_info_.yearOfHw >= 2017) { - sp<IGnssDebug> iGnssDebug = gnssDebug; - EXPECT_NE(iGnssDebug, nullptr); + if (!IsAutomotiveDevice() && info_called_count_ > 0 && last_info_.yearOfHw >= 2017) { + sp<IGnssDebug> iGnssDebug = gnssDebug; + EXPECT_NE(iGnssDebug, nullptr); } } diff --git a/gnss/1.1/vts/functional/gnss_hal_test_cases.cpp b/gnss/1.1/vts/functional/gnss_hal_test_cases.cpp index ee236ba5d..f72735e35 100644 --- a/gnss/1.1/vts/functional/gnss_hal_test_cases.cpp +++ b/gnss/1.1/vts/functional/gnss_hal_test_cases.cpp @@ -21,6 +21,7 @@ #include <VtsHalHidlTargetTestBase.h> #include <android/hardware/gnss/1.1/IGnssConfiguration.h> +#include <cutils/properties.h> using android::hardware::hidl_vec; @@ -33,6 +34,12 @@ using android::hardware::gnss::V1_0::IGnssDebug; using android::hardware::gnss::V1_1::IGnssConfiguration; using android::hardware::gnss::V1_1::IGnssMeasurement; +static bool IsAutomotiveDevice() { + char buffer[PROPERTY_VALUE_MAX] = {0}; + property_get("ro.hardware.type", buffer, ""); + return strncmp(buffer, "automotive", PROPERTY_VALUE_MAX) == 0; +} + /* * SetupTeardownCreateCleanup: * Requests the gnss HAL then calls cleanup @@ -447,7 +454,7 @@ TEST_F(GnssHalTest, InjectBestLocation) { TEST_F(GnssHalTest, GnssDebugValuesSanityTest) { auto gnssDebug = gnss_hal_->getExtensionGnssDebug(); ASSERT_TRUE(gnssDebug.isOk()); - if (info_called_count_ > 0 && last_info_.yearOfHw >= 2017) { + if (!IsAutomotiveDevice() && info_called_count_ > 0 && last_info_.yearOfHw >= 2017) { sp<IGnssDebug> iGnssDebug = gnssDebug; EXPECT_NE(iGnssDebug, nullptr); |