Merge "Wean Statsd off BatteryStats: WakeupAlarm" (346b70df) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/os/BatteryStatsImpl.java

+0 −4

Original line number	Diff line number	Diff line
		@@ -4258,8 +4258,6 @@ public class BatteryStatsImpl extends BatteryStats {
		workSourceName != null ? workSourceName : packageName);
		pkg.noteWakeupAlarmLocked(tag);
		}
		StatsLog.write_non_chained(StatsLog.WAKEUP_ALARM_OCCURRED, workSource.get(i),
		workSource.getName(i), tag);
		}

		ArrayList<WorkChain> workChains = workSource.getWorkChains();
		@@ -4272,7 +4270,6 @@ public class BatteryStatsImpl extends BatteryStats {
		BatteryStatsImpl.Uid.Pkg pkg = getPackageStatsLocked(uid, packageName);
		pkg.noteWakeupAlarmLocked(tag);
		}
		StatsLog.write(StatsLog.WAKEUP_ALARM_OCCURRED, wc.getUids(), wc.getTags(), tag);
		}
		}
		} else {
		@@ -4280,7 +4277,6 @@ public class BatteryStatsImpl extends BatteryStats {
		BatteryStatsImpl.Uid.Pkg pkg = getPackageStatsLocked(uid, packageName);
		pkg.noteWakeupAlarmLocked(tag);
		}
		StatsLog.write_non_chained(StatsLog.WAKEUP_ALARM_OCCURRED, uid, null, tag);
		}
		}

+5 −0

Original line number	Diff line number	Diff line
		@@ -14587,6 +14587,11 @@ public class ActivityManagerService extends IActivityManager.Stub
		}

		mBatteryStatsService.noteWakupAlarm(sourcePkg, sourceUid, workSource, tag);
		if (workSource != null) {
		StatsLog.write(StatsLog.WAKEUP_ALARM_OCCURRED, workSource, tag);
		} else {
		StatsLog.write_non_chained(StatsLog.WAKEUP_ALARM_OCCURRED, sourceUid, null, tag);
		}
		}

		@Override