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.

1 files changed, 3 insertions, 1 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,