Merge "statsd: Remove repetitive logging if ODPM is not present" into qt-r1-dev

This commit is contained in:
Thierry Strudel
2019-05-29 16:44:23 +00:00
committed by Android (Google) Code Review

View File

@@ -85,7 +85,6 @@ bool PowerStatsPuller::PullInternal(vector<shared_ptr<LogEvent>>* data) {
std::lock_guard<std::mutex> lock(gPowerStatsHalMutex); std::lock_guard<std::mutex> lock(gPowerStatsHalMutex);
if (!getPowerStatsHalLocked()) { if (!getPowerStatsHalLocked()) {
ALOGE("power.stats Hal not loaded");
return false; return false;
} }
@@ -116,6 +115,7 @@ bool PowerStatsPuller::PullInternal(vector<shared_ptr<LogEvent>>* data) {
if (gRailInfo.empty()) { if (gRailInfo.empty()) {
ALOGE("power.stats has no rail information"); ALOGE("power.stats has no rail information");
gPowerStatsExist = false; // No rail info, so never try again. gPowerStatsExist = false; // No rail info, so never try again.
gPowerStatsHal = nullptr;
return false; return false;
} }
} }