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

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

Change-Id: Id5b7eeef1da01e57e45008d696ee75758d7620a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-03-04 06:51:32 +00:00
committed by Automerger Merge Worker
4 changed files with 2 additions and 8 deletions

View File

@@ -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

View File

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

View File

@@ -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.
*/

View File

@@ -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<Event>* mCallback;
GTEST_DISALLOW_COPY_AND_ASSIGN_(SensorsVtsEnvironmentBase<Event>);
};
#endif // ANDROID_SENSORS_VTS_ENVIRONMENT_BASE_H