summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2014-07-25 00:31:21 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-07-23 22:55:49 +0000
commit525080910efd55df0d562980b6139c0efcc8a47c (patch)
treea4770ad1899c1a64e5f23310ed1bd15d618d86d7
parent6698ebf92857b7a390264b36603c57ae639b43a2 (diff)
parent82044f843c17d24839c3c384b08552c908c5b516 (diff)
downloadsystem_core-525080910efd55df0d562980b6139c0efcc8a47c.zip
system_core-525080910efd55df0d562980b6139c0efcc8a47c.tar.gz
system_core-525080910efd55df0d562980b6139c0efcc8a47c.tar.bz2
Merge "Silence healthd warnings."
-rw-r--r--healthd/BatteryMonitor.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/healthd/BatteryMonitor.cpp b/healthd/BatteryMonitor.cpp
index 688c7ff..fa87274 100644
--- a/healthd/BatteryMonitor.cpp
+++ b/healthd/BatteryMonitor.cpp
@@ -37,7 +37,7 @@
namespace android {
struct sysfsStringEnumMap {
- char* s;
+ const char* s;
int val;
};