From c30ca3077d8fbd28671875eb33be1b266941f426 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krzysztof=20Kosi=C5=84ski?= Date: Sat, 4 Mar 2023 00:46:48 +0000 Subject: [PATCH] Remove uses of deprecated GTest macro. Bug: 271622675 Test: local build, presubmit Change-Id: I525be287361e65d0c4194bc93d7f17ce3369da5d --- sensors/1.0/vts/functional/SensorsHidlEnvironmentV1_0.h | 2 -- sensors/aidl/vts/SensorsAidlEnvironment.h | 2 -- sensors/common/vts/2_X/SensorsHidlEnvironmentV2_X.h | 2 -- .../include/sensors-vts-utils/SensorsVtsEnvironmentBase.h | 4 ++-- 4 files changed, 2 insertions(+), 8 deletions(-) diff --git a/sensors/1.0/vts/functional/SensorsHidlEnvironmentV1_0.h b/sensors/1.0/vts/functional/SensorsHidlEnvironmentV1_0.h index b802e6c4b1..a4e4457a0e 100644 --- a/sensors/1.0/vts/functional/SensorsHidlEnvironmentV1_0.h +++ b/sensors/1.0/vts/functional/SensorsHidlEnvironmentV1_0.h @@ -46,8 +46,6 @@ class SensorsHidlEnvironmentV1_0 bool resetHal() override; void startPollingThread() override; static void pollingThread(SensorsHidlEnvironmentV1_0* env, std::atomic_bool& stop); - - GTEST_DISALLOW_COPY_AND_ASSIGN_(SensorsHidlEnvironmentV1_0); }; #endif // ANDROID_SENSORS_HIDL_ENVIRONMENT_V1_0_H \ No newline at end of file diff --git a/sensors/aidl/vts/SensorsAidlEnvironment.h b/sensors/aidl/vts/SensorsAidlEnvironment.h index 2f5f28712b..a852e91e5c 100644 --- a/sensors/aidl/vts/SensorsAidlEnvironment.h +++ b/sensors/aidl/vts/SensorsAidlEnvironment.h @@ -69,8 +69,6 @@ class SensorsAidlEnvironment : public SensorsVtsEnvironmentBase { */ void readEvents(); - GTEST_DISALLOW_COPY_AND_ASSIGN_(SensorsAidlEnvironment); - /** * Pointer to the Sensors HAL Interface that allows the test to call HAL functions. */ diff --git a/sensors/common/vts/2_X/SensorsHidlEnvironmentV2_X.h b/sensors/common/vts/2_X/SensorsHidlEnvironmentV2_X.h index 5fe4d8b54f..796de2f784 100644 --- a/sensors/common/vts/2_X/SensorsHidlEnvironmentV2_X.h +++ b/sensors/common/vts/2_X/SensorsHidlEnvironmentV2_X.h @@ -79,8 +79,6 @@ class SensorsHidlEnvironmentV2_X */ void readEvents(); - GTEST_DISALLOW_COPY_AND_ASSIGN_(SensorsHidlEnvironmentV2_X); - /** * Pointer to the Sensors HAL Interface that allows the test to call HAL functions. */ diff --git a/sensors/common/vts/utils/include/sensors-vts-utils/SensorsVtsEnvironmentBase.h b/sensors/common/vts/utils/include/sensors-vts-utils/SensorsVtsEnvironmentBase.h index 17a96ed739..e851d401d1 100644 --- a/sensors/common/vts/utils/include/sensors-vts-utils/SensorsVtsEnvironmentBase.h +++ b/sensors/common/vts/utils/include/sensors-vts-utils/SensorsVtsEnvironmentBase.h @@ -115,6 +115,8 @@ class SensorsVtsEnvironmentBase { : mCollectionEnabled(false), mCallback(nullptr) { mServiceName = service_name; } + SensorsVtsEnvironmentBase(const SensorsVtsEnvironmentBase&) = delete; + SensorsVtsEnvironmentBase& operator=(const SensorsVtsEnvironmentBase&) = delete; virtual ~SensorsVtsEnvironmentBase(){}; void addEvent(const Event& ev) { @@ -139,8 +141,6 @@ class SensorsVtsEnvironmentBase { std::mutex mEventsMutex; IEventCallback* mCallback; - - GTEST_DISALLOW_COPY_AND_ASSIGN_(SensorsVtsEnvironmentBase); }; #endif // ANDROID_SENSORS_VTS_ENVIRONMENT_BASE_H \ No newline at end of file