Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 11:36:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Remove uses of deprecated GTest macro." am: 3eed07ead0 am: c74317cabf

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

Change-Id: If0d69ee879fb82d39ebb70506d8aba52ea3aec71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-03-04 08:15:52 +00:00
committed by Automerger Merge Worker
parent da5022e6f5 c74317cabf
commit c13f8756d3
4 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sensors/1.0/vts/functional/SensorsHidlEnvironmentV1_0.h
View File

@@ -46,8 +46,6 @@ class SensorsHidlEnvironmentV1_0
bool resetHal() override; bool resetHal() override;
void startPollingThread() override; void startPollingThread() override;
static void pollingThread(SensorsHidlEnvironmentV1_0* env, std::atomic_bool& stop); 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 #endif // ANDROID_SENSORS_HIDL_ENVIRONMENT_V1_0_H

2
sensors/aidl/vts/SensorsAidlEnvironment.h
View File

@@ -69,8 +69,6 @@ class SensorsAidlEnvironment : public SensorsVtsEnvironmentBase<Event> {
*/ */
void readEvents(); void readEvents();
GTEST_DISALLOW_COPY_AND_ASSIGN_(SensorsAidlEnvironment);
/** /**
* Pointer to the Sensors HAL Interface that allows the test to call HAL functions. * Pointer to the Sensors HAL Interface that allows the test to call HAL functions.
*/ */

2
sensors/common/vts/2_X/SensorsHidlEnvironmentV2_X.h
View File

@@ -79,8 +79,6 @@ class SensorsHidlEnvironmentV2_X
*/ */
void readEvents(); void readEvents();
GTEST_DISALLOW_COPY_AND_ASSIGN_(SensorsHidlEnvironmentV2_X);
/** /**
* Pointer to the Sensors HAL Interface that allows the test to call HAL functions. * Pointer to the Sensors HAL Interface that allows the test to call HAL functions.
*/ */

4
sensors/common/vts/utils/include/sensors-vts-utils/SensorsVtsEnvironmentBase.h
View File

@@ -115,6 +115,8 @@ class SensorsVtsEnvironmentBase {
: mCollectionEnabled(false), mCallback(nullptr) { : mCollectionEnabled(false), mCallback(nullptr) {
mServiceName = service_name; mServiceName = service_name;
} }
SensorsVtsEnvironmentBase(const SensorsVtsEnvironmentBase&) = delete;
SensorsVtsEnvironmentBase& operator=(const SensorsVtsEnvironmentBase&) = delete;
virtual ~SensorsVtsEnvironmentBase(){}; virtual ~SensorsVtsEnvironmentBase(){};
void addEvent(const Event& ev) { void addEvent(const Event& ev) {
@@ -139,8 +141,6 @@ class SensorsVtsEnvironmentBase {
std::mutex mEventsMutex; std::mutex mEventsMutex;
IEventCallback<Event>* mCallback; IEventCallback<Event>* mCallback;
GTEST_DISALLOW_COPY_AND_ASSIGN_(SensorsVtsEnvironmentBase<Event>);
}; };
#endif // ANDROID_SENSORS_VTS_ENVIRONMENT_BASE_H #endif // ANDROID_SENSORS_VTS_ENVIRONMENT_BASE_H