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

Merge "Fix crash in writing battery stats to health stats" into nyc-dev

Browse Source
This commit is contained in:
Joe Onorato
2016-03-24 23:07:19 +00:00
committed by Android (Google) Code Review
parent 6a7c90a12b a2f003bc3c
commit 7b7c0a4e45
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/am/HealthStatsBatteryStatsWriter.java
View File

@@ -122,7 +122,8 @@ public class HealthStatsBatteryStatsWriter {
// Battery Stats stores the GPS sensors with a bogus key in this API. Pull it out // Battery Stats stores the GPS sensors with a bogus key in this API. Pull it out
// as a separate metric here so as to not expose that in the API. // as a separate metric here so as to not expose that in the API.
if (sensorId == BatteryStats.Uid.Sensor.GPS) { if (sensorId == BatteryStats.Uid.Sensor.GPS) {
addTimer(uidWriter, UidHealthStats.TIMER_GPS_SENSOR, sensors.valueAt(i).getSensorTime()); addTimer(uidWriter, UidHealthStats.TIMER_GPS_SENSOR,
sensors.valueAt(i).getSensorTime());
} else { } else {
addTimers(uidWriter, UidHealthStats.TIMERS_SENSORS, Integer.toString(sensorId), addTimers(uidWriter, UidHealthStats.TIMERS_SENSORS, Integer.toString(sensorId),
sensors.valueAt(i).getSensorTime()); sensors.valueAt(i).getSensorTime());
@@ -131,7 +132,7 @@ public class HealthStatsBatteryStatsWriter {
// STATS_PIDS // STATS_PIDS
pids = uid.getPidStats(); pids = uid.getPidStats();
N = sensors.size(); N = pids.size();
for (int i=0; i<N; i++) { for (int i=0; i<N; i++) {
final HealthStatsWriter writer = new HealthStatsWriter(PidHealthStats.CONSTANTS); final HealthStatsWriter writer = new HealthStatsWriter(PidHealthStats.CONSTANTS);
writePid(writer, pids.valueAt(i)); writePid(writer, pids.valueAt(i));
@@ -241,7 +242,8 @@ public class HealthStatsBatteryStatsWriter {
addTimer(uidWriter, UidHealthStats.TIMER_CAMERA, uid.getCameraTurnedOnTimer()); addTimer(uidWriter, UidHealthStats.TIMER_CAMERA, uid.getCameraTurnedOnTimer());
// TIMER_FOREGROUND_ACTIVITY // TIMER_FOREGROUND_ACTIVITY
addTimer(uidWriter, UidHealthStats.TIMER_FOREGROUND_ACTIVITY, uid.getForegroundActivityTimer()); addTimer(uidWriter, UidHealthStats.TIMER_FOREGROUND_ACTIVITY,
uid.getForegroundActivityTimer());
// TIMER_BLUETOOTH_SCAN // TIMER_BLUETOOTH_SCAN
addTimer(uidWriter, UidHealthStats.TIMER_BLUETOOTH_SCAN, uid.getBluetoothScanTimer()); addTimer(uidWriter, UidHealthStats.TIMER_BLUETOOTH_SCAN, uid.getBluetoothScanTimer());