diff options
| author | Andreas Gampe <agampe@google.com> | 2014-11-25 20:03:41 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-25 20:03:41 +0000 |
| commit | 906ee0d75770028167cc504af412846f593246af (patch) | |
| tree | 9c79734b2131ca300486df306ecf55c0d39b9849 /healthd | |
| parent | 0f41d611290128273eb18d6fea4be7f0922c8a4b (diff) | |
| parent | 38c3386a6cd44789f540fb9700c284345e7269e3 (diff) | |
| download | system_core-906ee0d75770028167cc504af412846f593246af.zip system_core-906ee0d75770028167cc504af412846f593246af.tar.gz system_core-906ee0d75770028167cc504af412846f593246af.tar.bz2 | |
am 38c3386a: resolved conflicts for merge of 03be4928 to lmp-mr1-dev-plus-aosp
* commit '38c3386a6cd44789f540fb9700c284345e7269e3':
Healthd: Remove unused variables
Diffstat (limited to 'healthd')
| -rw-r--r-- | healthd/BatteryMonitor.cpp | 1 | ||||
| -rw-r--r-- | healthd/healthd.cpp | 1 | ||||
| -rw-r--r-- | healthd/healthd_mode_charger.cpp | 6 |
3 files changed, 0 insertions, 8 deletions
diff --git a/healthd/BatteryMonitor.cpp b/healthd/BatteryMonitor.cpp index 9388ed0..7ea8250 100644 --- a/healthd/BatteryMonitor.cpp +++ b/healthd/BatteryMonitor.cpp @@ -389,7 +389,6 @@ void BatteryMonitor::init(struct healthd_config *hc) { if (!strcmp(name, ".") || !strcmp(name, "..")) continue; - char buf[20]; // Look for "type" file in each subdirectory path.clear(); path.appendFormat("%s/%s/type", POWER_SUPPLY_SYSFS_PATH, name); diff --git a/healthd/healthd.cpp b/healthd/healthd.cpp index cc322d3..b0002cc 100644 --- a/healthd/healthd.cpp +++ b/healthd/healthd.cpp @@ -66,7 +66,6 @@ static int epollfd; #define MAX_EPOLL_EVENTS 40 static int uevent_fd; static int wakealarm_fd; -static int binder_fd; // -1 for no epoll timeout static int awake_poll_interval = -1; diff --git a/healthd/healthd_mode_charger.cpp b/healthd/healthd_mode_charger.cpp index e7fccab..8931983 100644 --- a/healthd/healthd_mode_charger.cpp +++ b/healthd/healthd_mode_charger.cpp @@ -345,7 +345,6 @@ static void reset_animation(struct animation *anim) static void update_screen_state(struct charger *charger, int64_t now) { struct animation *batt_anim = charger->batt_anim; - int cur_frame; int disp_time; if (!batt_anim->run || now < charger->next_screen_transition) @@ -388,7 +387,6 @@ static void update_screen_state(struct charger *charger, int64_t now) /* animation starting, set up the animation */ if (batt_anim->cur_frame == 0) { - int ret; LOGV("[%" PRId64 "] animation starting\n", now); if (batt_prop && batt_prop->batteryLevel >= 0 && batt_anim->num_frames != 0) { @@ -511,7 +509,6 @@ static void set_next_key_check(struct charger *charger, static void process_key(struct charger *charger, int code, int64_t now) { struct key_state *key = &charger->keys[code]; - int64_t next_key_check; if (code == KEY_POWER) { if (key->down) { @@ -599,7 +596,6 @@ void healthd_mode_charger_heartbeat() { struct charger *charger = &charger_state; int64_t now = curr_time_ms(); - int ret; handle_input_state(charger, now); handle_power_supply_state(charger, now); @@ -634,8 +630,6 @@ int healthd_mode_charger_preparetowait(void) int64_t now = curr_time_ms(); int64_t next_event = INT64_MAX; int64_t timeout; - struct input_event ev; - int ret; LOGV("[%" PRId64 "] next screen: %" PRId64 " next key: %" PRId64 " next pwr: %" PRId64 "\n", now, charger->next_screen_transition, charger->next_key_check, |