Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "PowerManagerService: open power HAL less aggressively" into oc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-05-08 21:46:24 +00:00
committed by Android (Google) Code Review
parent 05e63bf5fa a9703163c0
commit ebf8ae5f44
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/jni/com_android_server_power_PowerManagerService.cpp
View File

@@ -57,6 +57,7 @@ static struct {
static jobject gPowerManagerServiceObj; static jobject gPowerManagerServiceObj;
sp<IPower> gPowerHal = nullptr; sp<IPower> gPowerHal = nullptr;
bool gPowerHalExists = true;
std::mutex gPowerHalMutex; std::mutex gPowerHalMutex;
static nsecs_t gLastEventTime[USER_ACTIVITY_EVENT_LAST + 1]; static nsecs_t gLastEventTime[USER_ACTIVITY_EVENT_LAST + 1];
@@ -78,12 +79,13 @@ static bool checkAndClearExceptionFromCallback(JNIEnv* env, const char* methodNa
// Check validity of current handle to the power HAL service, and call getService() if necessary. // Check validity of current handle to the power HAL service, and call getService() if necessary.
// The caller must be holding gPowerHalMutex. // The caller must be holding gPowerHalMutex.
bool getPowerHal() { bool getPowerHal() {
if (gPowerHal == nullptr) { if (gPowerHalExists && gPowerHal == nullptr) {
gPowerHal = IPower::getService(); gPowerHal = IPower::getService();
if (gPowerHal != nullptr) { if (gPowerHal != nullptr) {
ALOGI("Loaded power HAL service"); ALOGI("Loaded power HAL service");
} else { } else {
ALOGI("Couldn't load power HAL service"); ALOGI("Couldn't load power HAL service");
gPowerHalExists = false;
} }
} }
return gPowerHal != nullptr; return gPowerHal != nullptr;