Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "BatteryStats: Clamp temperature to 0" into oc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-03-30 18:22:39 +00:00
committed by Android (Google) Code Review
parent 1a89073d8f 29ddfe55fb
commit 2042770ea5
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/com/android/internal/os/BatteryStatsImpl.java
View File

@@ -10057,6 +10057,9 @@ public class BatteryStatsImpl extends BatteryStats {
public void setBatteryStateLocked(int status, int health, int plugType, int level,
int temp, int volt, int chargeUAh, int chargeFullUAh) {
// Temperature is encoded without the signed bit, so clamp any negative temperatures to 0.
temp = Math.max(0, temp);
final boolean onBattery = plugType == BATTERY_PLUGGED_NONE;
final long uptime = mClocks.uptimeMillis();
final long elapsedRealtime = mClocks.elapsedRealtime();

5
services/core/java/com/android/server/BatteryService.java
View File

@@ -679,7 +679,7 @@ public final class BatteryService extends SystemService {
pw.println("Battery service (battery) commands:");
pw.println(" help");
pw.println(" Print this help text.");
pw.println(" set [-f] [ac|usb|wireless|status|level|present|invalid] <value>");
pw.println(" set [-f] [ac|usb|wireless|status|level|temp|present|invalid] <value>");
pw.println(" Force a battery property value, freezing battery state.");
pw.println(" -f: force a battery change broadcast be sent, prints new sequence.");
pw.println(" unplug [-f]");
@@ -767,6 +767,9 @@ public final class BatteryService extends SystemService {
case "level":
mBatteryProps.batteryLevel = Integer.parseInt(value);
break;
case "temp":
mBatteryProps.batteryTemperature = Integer.parseInt(value);
break;
case "invalid":
mInvalidCharger = Integer.parseInt(value);
break;