am 3ed8b3d: Merge change 1018 into donut
Merge commit '3ed8b3dc42800068951332aea024f9737c25a0ed' * commit '3ed8b3dc42800068951332aea024f9737c25a0ed': If no battery stats are found, return status_unknown
This commit is contained in:
committed by
The Android Open Source Project
commit
39a8bb2632
@@ -186,6 +186,9 @@ static void android_server_BatteryService_update(JNIEnv* env, jobject obj)
|
||||
|
||||
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));
|
||||
|
||||
Reference in New Issue
Block a user