tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Skip GnssMeasurement VTS for Android Automotive OS." am: d8a767a847 am: d66b12008f

Browse source 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1443915

Change-Id: I68df407a9e76197cae516a479880cf0c6ad5a815
This commit is contained in:
Treehugger Robot 2020-10-05 19:02:26 +00:00 committed by Automerger Merge Worker
commit 0bd8713642
5 changed files with 36 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
gnss/1.0/vts/functional/VtsHalGnssV1_0TargetTest.cpp
View file

@ -39,6 +39,10 @@ using android::hardware::gnss::V1_0::IGnssDebug;
using android::hardware::gnss::V1_0::IGnssMeasurement;
using android::sp;
/*
* Since Utils.cpp depends on Gnss Hal 2.0, the tests for Gnss Hal 1.0 will use
* there own version of IsAutomotiveDevice() instead of the common version.
*/
static bool IsAutomotiveDevice() {
char buffer[PROPERTY_VALUE_MAX] = {0};
property_get("ro.hardware.type", buffer, "");
@ -492,9 +496,9 @@ TEST_P(GnssHalTest, GetAllExtensions) {
* Verifies that modern hardware supports measurement capabilities.
*/
TEST_P(GnssHalTest, MeasurementCapabilites) {
if (info_called_count_ > 0 && last_info_.yearOfHw >= 2016) {
EXPECT_TRUE(last_capabilities_ & IGnssCallback::Capabilities::MEASUREMENTS);
}
if (!IsAutomotiveDevice() && info_called_count_ > 0 && last_info_.yearOfHw >= 2016) {
EXPECT_TRUE(last_capabilities_ & IGnssCallback::Capabilities::MEASUREMENTS);
}
}
/*
@ -529,4 +533,4 @@ int main(int argc, char** argv) {
}
return RUN_ALL_TESTS();
}
}

9
gnss/2.0/vts/functional/gnss_hal_test_cases.cpp
View file

@ -62,6 +62,15 @@ TEST_P(GnssHalTest, TestGnssMeasurementExtension) {
auto gnssMeasurement_1_0 = gnss_hal_->getExtensionGnssMeasurement();
ASSERT_TRUE(gnssMeasurement_2_0.isOk() && gnssMeasurement_1_1.isOk() &&
gnssMeasurement_1_0.isOk());
// CDD does not require Android Automotive OS devices to support
// GnssMeasurements.
if (Utils::isAutomotiveDevice()) {
ALOGI("Test GnssMeasurementExtension skipped. Android Automotive OS deice is not required "
"to support GNSS measurements.");
return;
}
sp<IGnssMeasurement_2_0> iGnssMeas_2_0 = gnssMeasurement_2_0;
sp<IGnssMeasurement_1_1> iGnssMeas_1_1 = gnssMeasurement_1_1;
sp<IGnssMeasurement_1_0> iGnssMeas_1_0 = gnssMeasurement_1_0;

9
gnss/2.1/vts/functional/gnss_hal_test_cases.cpp
View file

@ -63,6 +63,15 @@ TEST_P(GnssHalTest, TestGnssMeasurementExtension) {
auto gnssMeasurement_1_0 = gnss_hal_->getExtensionGnssMeasurement();
ASSERT_TRUE(gnssMeasurement_2_1.isOk() && gnssMeasurement_2_0.isOk() &&
gnssMeasurement_1_1.isOk() && gnssMeasurement_1_0.isOk());
// CDD does not require Android Automotive OS devices to support
// GnssMeasurements.
if (Utils::isAutomotiveDevice()) {
ALOGI("Test GnssMeasurementExtension skipped. Android Automotive OS de ice is not "
"required to support GNSS measurements.");
return;
}
sp<IGnssMeasurement_2_1> iGnssMeas_2_1 = gnssMeasurement_2_1;
sp<IGnssMeasurement_2_0> iGnssMeas_2_0 = gnssMeasurement_2_0;
sp<IGnssMeasurement_1_1> iGnssMeas_1_1 = gnssMeasurement_1_1;

8
gnss/common/utils/vts/Utils.cpp
View file

@ -17,6 +17,8 @@
#include <Utils.h>
#include "gtest/gtest.h"
#include <cutils/properties.h>
namespace android {
namespace hardware {
namespace gnss {
@ -194,6 +196,12 @@ GnssConstellationType_1_0 Utils::mapConstellationType(GnssConstellationType_2_0
}
}
bool Utils::isAutomotiveDevice() {
char buffer[PROPERTY_VALUE_MAX] = {0};
property_get("ro.hardware.type", buffer, "");
return strncmp(buffer, "automotive", PROPERTY_VALUE_MAX) == 0;
}
} // namespace common
} // namespace gnss
} // namespace hardware

2
gnss/common/utils/vts/include/Utils.h
View file

@ -49,6 +49,8 @@ struct Utils {
static const MeasurementCorrections_1_1 getMockMeasurementCorrections_1_1();
static GnssConstellationType_1_0 mapConstellationType(GnssConstellationType_2_0 constellation);
static bool isAutomotiveDevice();
};
} // namespace common