From 7ccd2c9d16743820369a5e61e6b41919c4978407 Mon Sep 17 00:00:00 2001 From: Michael Sevakis Date: Wed, 25 Jan 2012 12:02:54 -0500 Subject: Fix power_input_status in sim where target has a battery switch. Change-Id: Ic00410a5b143d71928dc67c47d94d317b8ecadcd --- uisimulator/common/powermgmt-sim.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'uisimulator') diff --git a/uisimulator/common/powermgmt-sim.c b/uisimulator/common/powermgmt-sim.c index 41732c94a2..3430b1ea79 100644 --- a/uisimulator/common/powermgmt-sim.c +++ b/uisimulator/common/powermgmt-sim.c @@ -121,8 +121,14 @@ int _battery_voltage(void) #if CONFIG_CHARGING unsigned int power_input_status(void) { - return charger_input_state >= CHARGER_PLUGGED + unsigned int status = charger_input_state >= CHARGER_PLUGGED ? POWER_INPUT_CHARGER : POWER_INPUT_NONE; + +#ifdef HAVE_BATTERY_SWITCH + status |= POWER_INPUT_BATTERY; +#endif + + return status; } bool charging_state(void) -- cgit v1.2.3