Merge pull request #6714 from BOINC/dpa_android_battery3

client, Android: clarify message

Author: AenBleidd

client/client_state.cpp

@@ -161,6 +161,8 @@ CLIENT_STATE::CLIENT_STATE()
     total_disk_usage = 0.0;
 #ifdef ANDROID
     device_status_time = dtime();
+    battery_charge_resume_time = 0;
+    battery_heat_resume_time = 0;
 #endif
 
     rec_interval_start = 0;

client/client_state.h

@@ -106,6 +106,8 @@ struct CLIENT_STATE {
         // info from GUI, e.g. battery status
     double device_status_time;
         // time of last RPC from GUI
+    double battery_charge_resume_time;
+    double battery_heat_resume_time;
 #endif
 
     char language[16];                // ISO language code reported by GUI

client/cs_prefs.cpp

@@ -283,10 +283,6 @@ int CLIENT_STATE::check_suspend_processing() {
         // If suspend because of hot battery, don't resume for at least 5 min
         // (crude hysteresis)
         //
-        static double battery_heat_resume_time=0;
-        if (now < battery_heat_resume_time) {
-            return SUSPEND_REASON_BATTERY_OVERHEATED;
-        }
         if (device_status.battery_state == BATTERY_STATE_OVERHEATED) {
             battery_heat_resume_time = now + ANDROID_BATTERY_BACKOFF;
             return SUSPEND_REASON_BATTERY_OVERHEATED;
@@ -295,20 +291,20 @@ int CLIENT_STATE::check_suspend_processing() {
             battery_heat_resume_time = now + ANDROID_BATTERY_BACKOFF;
             return SUSPEND_REASON_BATTERY_OVERHEATED;
         }
+        if (now < battery_heat_resume_time) {
+            return SUSPEND_REASON_BATTERY_HEAT_WAIT;
+        }
 
         // check for sufficient battery charge.
         // If suspend, don't resume for at least 5 min
         //
-        static double battery_charge_resume_time=0;
-        if (now < battery_charge_resume_time) {
+        int cp = device_status.battery_charge_pct;
+        if ((cp >= 0) && (cp < global_prefs.battery_charge_min_pct)) {
+            battery_charge_resume_time = now + ANDROID_BATTERY_BACKOFF;
             return SUSPEND_REASON_BATTERY_CHARGING;
         }
-        int cp = device_status.battery_charge_pct;
-        if (cp >= 0) {
-            if (cp < global_prefs.battery_charge_min_pct) {
-                battery_charge_resume_time = now + ANDROID_BATTERY_BACKOFF;
-                return SUSPEND_REASON_BATTERY_CHARGING;
-            }
+        if (now < battery_charge_resume_time) {
+            return SUSPEND_REASON_BATTERY_CHARGE_WAIT;
         }
     }
 #endif
@@ -375,12 +371,28 @@ void CLIENT_STATE::show_suspend_tasks_message(int reason) {
         case SUSPEND_REASON_BATTERY_CHARGING:
             if (log_flags.task) {
                 msg_printf(NULL, MSG_INFO,
-                    "(battery charge level %.1f%% < threshold %.1f%%",
+                    "(battery charge level %.1f%% < threshold %.1f%%)",
                     device_status.battery_charge_pct,
                     global_prefs.battery_charge_min_pct
                 );
             }
             break;
+        case SUSPEND_REASON_BATTERY_CHARGE_WAIT:
+            if (log_flags.task) {
+                msg_printf(NULL, MSG_INFO,
+                    "(battery charge wait: %.0f sec)",
+                    battery_charge_resume_time - now
+                );
+            }
+            break;
+        case SUSPEND_REASON_BATTERY_HEAT_WAIT:
+            if (log_flags.task) {
+                msg_printf(NULL, MSG_INFO,
+                    "(battery heat wait: %.0f sec)",
+                    battery_heat_resume_time - now
+                );
+            }
+            break;
         }
 #endif
     }

lib/common_defs.h

@@ -181,7 +181,9 @@ enum SUSPEND_REASON {
     SUSPEND_REASON_BATTERY_CHARGING = 4098,
     SUSPEND_REASON_BATTERY_OVERHEATED = 4099,
     SUSPEND_REASON_NO_GUI_KEEPALIVE = 4100,
-    SUSPEND_REASON_PODMAN_INIT = 4101
+    SUSPEND_REASON_PODMAN_INIT = 4101,
+    SUSPEND_REASON_BATTERY_CHARGE_WAIT = 4102,
+    SUSPEND_REASON_BATTERY_HEAT_WAIT = 4103
 };
 
 // battery state (currently used only for Android)