diff options
| author | Andreas Gampe <agampe@google.com> | 2014-11-25 02:53:27 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-11-25 02:53:28 +0000 |
| commit | 03be4928422bd601bce3267fcf69b160f175db6d (patch) | |
| tree | aa3912277dfeba360d104984ece4f885090234c4 | |
| parent | 077ff30954275e635c5faa8b75afcd0a44a78dcc (diff) | |
| parent | c0970d31f3089c16d6f230decfef2566731a529a (diff) | |
| download | system_core-03be4928422bd601bce3267fcf69b160f175db6d.zip system_core-03be4928422bd601bce3267fcf69b160f175db6d.tar.gz system_core-03be4928422bd601bce3267fcf69b160f175db6d.tar.bz2 | |
Merge "Healthd: Remove unused variables"
| -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 4a6b702..06497c2 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 30a4b42..b34583d 100644 --- a/healthd/healthd.cpp +++ b/healthd/healthd.cpp @@ -64,7 +64,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 394feb8..291cb6c 100644 --- a/healthd/healthd_mode_charger.cpp +++ b/healthd/healthd_mode_charger.cpp @@ -350,7 +350,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) @@ -393,7 +392,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 batt_cap; - int ret; LOGV("[%" PRId64 "] animation starting\n", now); batt_cap = get_battery_capacity(); @@ -517,7 +515,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) { @@ -590,7 +587,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); @@ -625,8 +621,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, |