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

am: 618e3eabcd Change-Id: Ib8d20a88ddb9bbe7a93cf0bb6a315245c9dfa9fc
2019-05-29 10:01:31 -07:00
parent 805d935926 618e3eabcd
commit 39a91c875b
1 changed files with 1 additions and 1 deletions
--- a/cmds/statsd/src/external/PowerStatsPuller.cpp
+++ b/cmds/statsd/src/external/PowerStatsPuller.cpp
@@ -85,7 +85,6 @@ bool PowerStatsPuller::PullInternal(vector<shared_ptr<LogEvent>>* data) {
    std::lock_guard<std::mutex> lock(gPowerStatsHalMutex);

    if (!getPowerStatsHalLocked()) {
-        ALOGE("power.stats Hal not loaded");
        return false;
    }

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