diff options
| author | 2018-01-05 19:29:17 +0000 | |
|---|---|---|
| committer | 2018-01-05 19:29:17 +0000 | |
| commit | bf1b0b04bf135586a24b57de0ab7eca20e4d5fe3 (patch) | |
| tree | b3245c95b906f76d9d6e2586bdd13bfff2eba047 | |
| parent | 3c8275552797f308108887536922bf65ce50a1b4 (diff) | |
| parent | 6f724c4b9e4c7c6cae508742a0aef06798fe3051 (diff) | |
Merge "Bugfix: wakeup alarms logging"
| -rw-r--r-- | core/java/com/android/internal/os/BatteryStatsImpl.java | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/core/java/com/android/internal/os/BatteryStatsImpl.java b/core/java/com/android/internal/os/BatteryStatsImpl.java index db8fcf6eee74..4636e5eb1a3a 100644 --- a/core/java/com/android/internal/os/BatteryStatsImpl.java +++ b/core/java/com/android/internal/os/BatteryStatsImpl.java @@ -4028,18 +4028,17 @@ public class BatteryStatsImpl extends BatteryStats { public void noteWakupAlarmLocked(String packageName, int uid, WorkSource workSource, String tag) { - if (!isOnBattery()) { - return; - } if (workSource != null) { for (int i = 0; i < workSource.size(); ++i) { uid = workSource.get(i); final String workSourceName = workSource.getName(i); - BatteryStatsImpl.Uid.Pkg pkg = getPackageStatsLocked(uid, - workSourceName != null ? workSourceName : packageName); - pkg.noteWakeupAlarmLocked(tag); + if (isOnBattery()) { + BatteryStatsImpl.Uid.Pkg pkg = getPackageStatsLocked(uid, + workSourceName != null ? workSourceName : packageName); + pkg.noteWakeupAlarmLocked(tag); + } StatsLog.write(StatsLog.WAKEUP_ALARM_OCCURRED, uid, tag); } @@ -4050,16 +4049,20 @@ public class BatteryStatsImpl extends BatteryStats { final WorkChain wc = workChains.get(i); uid = wc.getAttributionUid(); - BatteryStatsImpl.Uid.Pkg pkg = getPackageStatsLocked(uid, packageName); - pkg.noteWakeupAlarmLocked(tag); + if (isOnBattery()) { + BatteryStatsImpl.Uid.Pkg pkg = getPackageStatsLocked(uid, packageName); + pkg.noteWakeupAlarmLocked(tag); + } // TODO(statsd): Log the full attribution chain here once it's available StatsLog.write(StatsLog.WAKEUP_ALARM_OCCURRED, uid, tag); } } } else { - BatteryStatsImpl.Uid.Pkg pkg = getPackageStatsLocked(uid, packageName); - pkg.noteWakeupAlarmLocked(tag); + if (isOnBattery()) { + BatteryStatsImpl.Uid.Pkg pkg = getPackageStatsLocked(uid, packageName); + pkg.noteWakeupAlarmLocked(tag); + } StatsLog.write(StatsLog.WAKEUP_ALARM_OCCURRED, uid, tag); } } |