Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 42b2f781 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

VTS: only assert that IGnssDebug present for non-automotive am: 2fd5c7cd am: 984b3069 

Change-Id: I4694449509de580da4049cef13458d35aed117af
parents 119b9ea0 984b3069

gnss/1.0/vts/functional/VtsHalGnssV1_0TargetTest.cpp

+11 −3
Original line number Diff line number Diff line
@@ -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,7 +468,7 @@ TEST_F(GnssHalTest, GetAllExtensions) { 


  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);

  }

gnss/1.1/vts/functional/gnss_hal_test_cases.cpp

+8 −1
Original line number Diff line number Diff line
@@ -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);