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

Merge "Bugfix: wakeup alarms logging"

Browse Source
This commit is contained in:
TreeHugger Robot
2018-01-05 19:29:17 +00:00
committed by Android (Google) Code Review
parent 3c82755527 6f724c4b9e
commit bf1b0b04bf
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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);
}
}