commit d44cb91e44ed3cc2a4e6634e674c34aca9dc5028
author Ruchi Kandoi <kandoiruchi@google.com> Tue Feb 23 17:41:11 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Feb 23 17:41:11 2016 +0000
tree 9f642c3d3e8119a498e77bfa5afaba5882f3c532
parent adab4bf821ebd2cc0ba05018640eb39d03bf84eb
parent d39e0dd0c94a42b7cb26167dc453aabfd8ecdd5e

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

* commit '78ed1935e1508326afb22be4dd7f9961922347fb':
  healthd: Remove warning by clang compiler.

healthd/BatteryMonitor.cpp

diff --git a/healthd/BatteryMonitor.cpp b/healthd/BatteryMonitor.cpp
index efb273a..5123505 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" : "",