From fa9dc6694773202079263e1fa9f94b87d8fed13b Mon Sep 17 00:00:00 2001 From: Wetitpig Date: Fri, 20 Sep 2019 09:19:29 +0800 Subject: [PATCH 1/3] =?UTF-8?q?Battery=20Current=20in=20=CE=BCA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/com/termux/api/BatteryStatusAPI.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/src/main/java/com/termux/api/BatteryStatusAPI.java b/app/src/main/java/com/termux/api/BatteryStatusAPI.java index bcc2fc27f..7ccf60d2a 100644 --- a/app/src/main/java/com/termux/api/BatteryStatusAPI.java +++ b/app/src/main/java/com/termux/api/BatteryStatusAPI.java @@ -97,12 +97,15 @@ public void writeJson(JsonWriter out) throws Exception { batteryStatusString = "UNKNOWN"; } + double batteryCurrent = batteryStatus.getIntExtra(BatteryManager.BATTERY_PROPERTY_CURRENT_NOW, -1); + out.beginObject(); out.name("health").value(batteryHealth); out.name("percentage").value(batteryPercentage); out.name("plugged").value(batteryPlugged); out.name("status").value(batteryStatusString); out.name("temperature").value(batteryTemperature); + out.name("current").value(batteryCurrent); out.endObject(); } }); From d063eb5d5770277bbe76ab7ccc0997450c89bf52 Mon Sep 17 00:00:00 2001 From: Wetitpig Date: Fri, 20 Sep 2019 10:06:05 +0800 Subject: [PATCH 2/3] Shouldn't need getIntextra --- app/src/main/java/com/termux/api/BatteryStatusAPI.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/termux/api/BatteryStatusAPI.java b/app/src/main/java/com/termux/api/BatteryStatusAPI.java index 7ccf60d2a..5f041f1a4 100644 --- a/app/src/main/java/com/termux/api/BatteryStatusAPI.java +++ b/app/src/main/java/com/termux/api/BatteryStatusAPI.java @@ -97,7 +97,7 @@ public void writeJson(JsonWriter out) throws Exception { batteryStatusString = "UNKNOWN"; } - double batteryCurrent = batteryStatus.getIntExtra(BatteryManager.BATTERY_PROPERTY_CURRENT_NOW, -1); + int batteryCurrent = batteryStatus.getLongProperty(BatteryManager.BATTERY_PROPERTY_CURRENT_NOW); out.beginObject(); out.name("health").value(batteryHealth); From 297442da9f867be5f4df896ee8a0caf1f369ba94 Mon Sep 17 00:00:00 2001 From: Wetitpig Date: Fri, 20 Sep 2019 10:10:49 +0800 Subject: [PATCH 3/3] long but not int --- app/src/main/java/com/termux/api/BatteryStatusAPI.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/termux/api/BatteryStatusAPI.java b/app/src/main/java/com/termux/api/BatteryStatusAPI.java index 5f041f1a4..21372306f 100644 --- a/app/src/main/java/com/termux/api/BatteryStatusAPI.java +++ b/app/src/main/java/com/termux/api/BatteryStatusAPI.java @@ -97,7 +97,7 @@ public void writeJson(JsonWriter out) throws Exception { batteryStatusString = "UNKNOWN"; } - int batteryCurrent = batteryStatus.getLongProperty(BatteryManager.BATTERY_PROPERTY_CURRENT_NOW); + long batteryCurrent = batteryStatus.getLongProperty(BatteryManager.BATTERY_PROPERTY_CURRENT_NOW); out.beginObject(); out.name("health").value(batteryHealth);