Merge "Remove reference of VtsHalHidlTargetTestBase" am: badb75e309 am: 88b5b44f89

Change-Id: I8f0ee727d4370aae80a44a016dbc12e8cda079bd
This commit is contained in:
Automerger Merge Worker
2020-02-05 00:06:24 +00:00
3 changed files with 2 additions and 5 deletions

View File

@@ -303,7 +303,7 @@ int32_t SensorsHidlTest::getInvalidSensorHandle() {
// Find a sensor handle that does not exist in the sensor list
int32_t maxHandle = 0;
for (const SensorInfo& sensor : getSensorsList()) {
maxHandle = max(maxHandle, sensor.sensorHandle);
maxHandle = std::max(maxHandle, sensor.sensorHandle);
}
return maxHandle + 1;
}

View File

@@ -20,7 +20,6 @@
#include "sensors-vts-utils/SensorEventsChecker.h"
#include "sensors-vts-utils/SensorsHidlEnvironmentBase.h"
#include <VtsHalHidlTargetTestBase.h>
#include <android/hardware/sensors/1.0/ISensors.h>
#include <android/hardware/sensors/1.0/types.h>
#include <gtest/gtest.h>
@@ -130,4 +129,4 @@ class SensorsHidlTestBase : public testing::TestWithParam<std::string> {
std::unordered_set<int32_t> mDirectChannelHandles;
};
#endif // ANDROID_SENSORS_HIDL_TEST_BASE_H
#endif // ANDROID_SENSORS_HIDL_TEST_BASE_H

View File

@@ -25,8 +25,6 @@
#include <type_traits>
#include <utility>
#include <VtsHalHidlTargetTestBase.h>
namespace {
namespace detail {
template <typename>