tequilaOS/platform_hardware_libhardware_legacy
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Simplify libpower"

Browse source 
am: e9f8002117

Change-Id: I28fc49eda15688d4c240ead6ffd67082aad41720
This commit is contained in:
Tri Vo 2018-10-16 17:17:10 -07:00 committed by android-build-merger
commit 36c877ff06
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
power.cpp
View file

@ -36,13 +36,7 @@ static std::mutex gLock;
static std::unordered_map<std::string, sp<IWakeLock>> gWakeLockMap; static std::unordered_map<std::string, sp<IWakeLock>> gWakeLockMap;
static sp<ISystemSuspend> getSystemSuspendServiceOnce() { static sp<ISystemSuspend> getSystemSuspendServiceOnce() {
static std::once_flag initFlag; static sp<ISystemSuspend> suspendService = ISystemSuspend::getService();
static sp<ISystemSuspend> suspendService = nullptr;
std::call_once(initFlag, []() {
// It's possible for the calling process to not have permissions to
// ISystemSuspend. getService will then return nullptr.
suspendService = ISystemSuspend::getService();
});
return suspendService; return suspendService;
} }
@ -64,8 +58,13 @@ int release_wake_lock(const char* id) {
ATRACE_CALL(); ATRACE_CALL();
std::lock_guard<std::mutex> l{gLock}; std::lock_guard<std::mutex> l{gLock};
if (gWakeLockMap[id]) { if (gWakeLockMap[id]) {
gWakeLockMap[id]->release(); // Ignore errors on release() call since hwbinder driver will clean up the underlying object
gWakeLockMap[id] = nullptr; // once we clear the corresponding strong pointer.
auto ret = gWakeLockMap[id]->release();
if (!ret.isOk()) {
LOG(ERROR) << "IWakeLock::release() call failed: " << ret.description();
}
gWakeLockMap[id].clear();
return 0; return 0;
} }
return -1; return -1;