commit 5962e18d0e5741511e78102a3746828b05f9f9ea
author The Android Open Source Project <initial-contribution@android.com> Fri Jan 09 17:51:25 2009 -0800
committer The Android Open Source Project <initial-contribution@android.com> Fri Jan 09 17:51:25 2009 -0800
tree 128aa611268ec1c6d80a61b17f4037c9dc547abc
parent abc48f80d8747b4fc051b7dd364355ee667a9bac

auto import from //branches/cupcake/...@125939

src/com/android/settings/BatteryInfo.java

diff --git a/src/com/android/settings/BatteryInfo.java b/src/com/android/settings/BatteryInfo.java
index ed3e3e3..f9962fa 100644
--- a/src/com/android/settings/BatteryInfo.java
+++ b/src/com/android/settings/BatteryInfo.java
@@ -184,8 +184,8 @@
         
         if (mBatteryStats != null) {
             try {
-                long awakeTimeBattery = mBatteryStats.getAwakeTimeBattery();
-                long awakeTimePluggedIn = mBatteryStats.getAwakeTimePlugged();
+                long awakeTimeBattery = mBatteryStats.getAwakeTimeBattery() / 1000;
+                long awakeTimePluggedIn = mBatteryStats.getAwakeTimePlugged() / 1000;
                 mAwakeBattery.setText(DateUtils.formatElapsedTime(awakeTimeBattery / 1000) 
                         + " (" + (100 * awakeTimeBattery / uptime) + "%)");
                 mAwakePlugged.setText(DateUtils.formatElapsedTime(awakeTimePluggedIn / 1000)