Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 39a8bb26 authored by Android (Google) Code Review's avatar Android (Google) Code Review Committed by The Android Open Source Project
Browse files

am 3ed8b3dc: Merge change 1018 into donut 

Merge commit '3ed8b3dc'

* commit '3ed8b3dc':
  If no battery stats are found, return status_unknown
parents 17ac18e2 3ed8b3dc

services/jni/com_android_server_BatteryService.cpp

+3 −0
Original line number Original line Diff line number Diff line
@@ -186,6 +186,9 @@ static void android_server_BatteryService_update(JNIEnv* env, jobject obj) 
    

    

    if (readFromFile(BATTERY_STATUS_PATH, buf, SIZE) > 0)

    if (readFromFile(BATTERY_STATUS_PATH, buf, SIZE) > 0)

        env->SetIntField(obj, gFieldIds.mBatteryStatus, getBatteryStatus(buf));

        env->SetIntField(obj, gFieldIds.mBatteryStatus, getBatteryStatus(buf));

    else

        env->SetIntField(obj, gFieldIds.mBatteryStatus,

                         gConstants.statusUnknown);

    

    

    if (readFromFile(BATTERY_HEALTH_PATH, buf, SIZE) > 0)

    if (readFromFile(BATTERY_HEALTH_PATH, buf, SIZE) > 0)

        env->SetIntField(obj, gFieldIds.mBatteryHealth, getBatteryHealth(buf));

        env->SetIntField(obj, gFieldIds.mBatteryHealth, getBatteryHealth(buf));