commit d39e0dd0c94a42b7cb26167dc453aabfd8ecdd5e
author Ruchi Kandoi <kandoiruchi@google.com> Tue Feb 23 17:36:48 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Feb 23 17:36:48 2016 +0000
tree a1cbdf23bf66ff3346cf618f53b4b3d2e23129fe
parent 80da0c816b50cca5236aae71012549cab4e89a6c
parent 067e6da26714ad234a1c7ebeb5cad27624195bb6

Merge "healthd: Remove warning by clang compiler."
am: 08c8b53800

* commit '08c8b53800fbfec28a8ea94f4443e9a3812b1ab3':
  healthd: Remove warning by clang compiler.

healthd/BatteryMonitor.cpp

diff --git a/healthd/BatteryMonitor.cpp b/healthd/BatteryMonitor.cpp
index 477148b..b33dd28 100644
--- a/healthd/BatteryMonitor.cpp
+++ b/healthd/BatteryMonitor.cpp
@@ -323,11 +323,10 @@
                                 " cc=%d", props.batteryCycleCount);
             }
         } else {
-            snprintf(dmesgline, sizeof(dmesgline),
+            len = snprintf(dmesgline, sizeof(dmesgline),
                  "battery none");
         }
 
-        len = strlen(dmesgline);
         snprintf(dmesgline + len, sizeof(dmesgline) - len, " chg=%s%s%s",
                  props.chargerAcOnline ? "a" : "",
                  props.chargerUsbOnline ? "u" : "",