mirror of
https://github.com/Evolution-X/hardware_interfaces
synced 2026-02-02 13:49:45 +00:00
55a4f59fb8
Today, when a ScopedWakelock is moved, the default move constructor doesn't unlock the old wakelock instance. This results in the moved ScopedWakelock instance decrementing the wakelock ref count which leaves the multi-HAL out of sync from the sensor service. Fix this by adding a custom move constructor / operator to ensure old state is cleared on the moved instance. Bug: 163468874 Test: Load multi-HAL and verify that it properly waits to release the wakelock until the sensor service notifies that it has a lock held. Test: Run unit tests Change-Id: Ifd5a3c7596f78d7a756c4472f30efb625d670791
63 lines
1.8 KiB
C++
63 lines
1.8 KiB
C++
/*
|
|
* Copyright (C) 2019 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
#include "V2_0/ScopedWakelock.h"
|
|
|
|
namespace android {
|
|
namespace hardware {
|
|
namespace sensors {
|
|
namespace V2_0 {
|
|
namespace implementation {
|
|
|
|
int64_t getTimeNow() {
|
|
return std::chrono::duration_cast<std::chrono::nanoseconds>(
|
|
std::chrono::system_clock::now().time_since_epoch())
|
|
.count();
|
|
}
|
|
|
|
ScopedWakelock::ScopedWakelock(ScopedWakelock&& other) {
|
|
*this = std::move(other);
|
|
}
|
|
|
|
ScopedWakelock& ScopedWakelock::operator=(ScopedWakelock&& other) {
|
|
mRefCounter = other.mRefCounter;
|
|
mCreatedAtTimeNs = other.mCreatedAtTimeNs;
|
|
mLocked = other.mLocked;
|
|
|
|
other.mRefCounter = nullptr;
|
|
other.mCreatedAtTimeNs = 0;
|
|
other.mLocked = false;
|
|
return *this;
|
|
}
|
|
|
|
ScopedWakelock::ScopedWakelock(IScopedWakelockRefCounter* refCounter, bool locked)
|
|
: mRefCounter(refCounter), mLocked(locked) {
|
|
if (mLocked) {
|
|
mLocked = mRefCounter->incrementRefCountAndMaybeAcquireWakelock(1, &mCreatedAtTimeNs);
|
|
}
|
|
}
|
|
|
|
ScopedWakelock::~ScopedWakelock() {
|
|
if (mLocked) {
|
|
mRefCounter->decrementRefCountAndMaybeReleaseWakelock(1, mCreatedAtTimeNs);
|
|
}
|
|
}
|
|
|
|
} // namespace implementation
|
|
} // namespace V2_0
|
|
} // namespace sensors
|
|
} // namespace hardware
|
|
} // namespace android
|