commit e7e6fa3fbfeae278f739f3863197d0c4fc750abe
author Rebecca Schultz Zavin <rebecca@android.com> Tue Apr 28 17:24:47 2009 -0700
committer Rebecca Schultz Zavin <rebecca@android.com> Tue May 05 16:15:36 2009 -0700
tree d453eac6fdc6470fe6e8ee04434d8a6c047fae9b
parent ef65477523a6170bab7897809d1a8f9a3f5165f6

If no battery stats are found, return status_unknown

If the battery files can't be found return status_unkown instead of an
error.  On systems where we haven't brought up battery stats yet they
assume the battery is dead and turn off as soon as the runtime starts

Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>

services/jni/com_android_server_BatteryService.cpp

diff --git a/services/jni/com_android_server_BatteryService.cpp b/services/jni/com_android_server_BatteryService.cpp
index 6636a97..2524966 100644
--- a/services/jni/com_android_server_BatteryService.cpp
+++ b/services/jni/com_android_server_BatteryService.cpp
@@ -186,6 +186,9 @@
     
     if (readFromFile(BATTERY_STATUS_PATH, buf, SIZE) > 0)
         env->SetIntField(obj, gFieldIds.mBatteryStatus, getBatteryStatus(buf));
+    else
+        env->SetIntField(obj, gFieldIds.mBatteryStatus,
+                         gConstants.statusUnknown);
     
     if (readFromFile(BATTERY_HEALTH_PATH, buf, SIZE) > 0)
         env->SetIntField(obj, gFieldIds.mBatteryHealth, getBatteryHealth(buf));