Port Android battery status to Android 4.4 and earlier

* java/org/gnu/emacs/EmacsService.java (EmacsService)
(queryBattery19): New function.
(queryBattery): Call it on old systems.  Also, return AC line
status and temperature.
* lisp/battery.el (battery-android): Implement more format
directives.
* src/android.c (android_query_battery): Handle new status
fields.
* src/android.h (struct android_battery_state): Add `plugged'
and `temperature'.
* src/androidfns.c (Fandroid_query_battery): Return new fields.

3 files changed, 25 insertions, 7 deletions

diff --git a/src/android.c b/src/android.c
index 69c87e731bd..763e17e9430 100644
--- a/src/android.c
+++ b/src/android.c
@@ -5754,7 +5754,7 @@ android_get_current_api_level (void)
 }
 
 /* Query the status of the battery, and place it in *STATUS.
-   Value is 1 if the system is too old, else 0.  */
+   Value is 1 upon failure, else 0.  */
 
 int
 android_query_battery (struct android_battery_state *status)
@@ -5783,6 +5783,8 @@ android_query_battery (struct android_battery_state *status)
   status->current_now = longs[3];
   status->remaining = longs[4];
   status->status = longs[5];
+  status->plugged = longs[6];
+  status->temperature = longs[7];
 
   (*android_java_env)->ReleaseLongArrayElements (android_java_env,
                                                  array, longs,
diff --git a/src/android.h b/src/android.h
index ed0089ad94e..450f3859df9 100644
--- a/src/android.h
+++ b/src/android.h
@@ -160,6 +160,18 @@ struct android_battery_state
           but is not charging either.
        1, if the battery state is unknown.  */
   int status;
+
+  /* The power source of the battery.  Value is:
+
+       0, if on battery power.
+       1, for line power.
+       8, for dock power.
+       2, for USB power.
+       4, for wireless power.  */
+  int plugged;
+
+  /* The temperature of the battery in 10 * degrees centigrade.  */
+  int temperature;
 };
 
 extern Lisp_Object android_browse_url (Lisp_Object);
diff --git a/src/androidfns.c b/src/androidfns.c
index 5a23e8bd196..2724b9595c1 100644
--- a/src/androidfns.c
+++ b/src/androidfns.c
@@ -2797,11 +2797,13 @@ frame_parm_handler android_frame_parm_handlers[] =
 DEFUN ("android-query-battery", Fandroid_query_battery,
        Sandroid_query_battery, 0, 0, 0,
        doc: /* Perform a query for battery information.
-This function will not work before Android 5.0.
 Value is nil upon failure, or a list of the form:
 
   (CAPACITY CHARGE-COUNTER CURRENT-AVERAGE CURRENT-NOW STATUS
-   REMAINING)
+   REMAINING PLUGGED TEMP)
+
+where REMAINING, CURRENT-AVERAGE, and CURRENT-NOW are undefined prior
+to Android 5.0.
 
 See the documentation at
 
@@ -2822,12 +2824,14 @@ for more details about these values.  */)
   if (android_query_battery (&state))
     return Qnil;
 
-  return listn (6, make_int (state.capacity),
-                make_int (state.charge_counter),
+  return listn (8, make_int (state.capacity),
+                make_fixnum (state.charge_counter),
                 make_int (state.current_average),
                 make_int (state.current_now),
-                make_int (state.status),
-                make_int (state.remaining));
+                make_fixnum (state.status),
+                make_int (state.remaining),
+                make_fixnum (state.plugged),
+                make_fixnum (state.temperature));
 }
 
 #endif