From 3d655ad09e861ee7b2f17c79270744a4e513f03b Mon Sep 17 00:00:00 2001 From: Salud Lemus Date: Mon, 6 Jul 2020 22:23:48 +0000 Subject: Replace manual creation of StatsEvent objects with their appropriate buildStatsEvent() method Currently, Java clients are manually creating the StatsEvent objects which can lead to errors. Now that there is support for pulled atoms for stats-log-api-gen for Java clients, use the appropriate buildStatsEvent method that was auto generated by stats-log-api-gen. Bug: 160368804 Test: Ran `m` and completed successfully Test: Ran `atest statsd_test` and all CTS tests passed Test: Ran `atest UidAtomTests` and all CTS tests passed except for the CTS tests related to a SIM card because the device does not have a SIM card Change-Id: Id229ba5ca94203135a8a5e2607de9844e0432ce1 --- .../internal/location/gnssmetrics/GnssMetrics.java | 30 +++++++++------------- 1 file changed, 12 insertions(+), 18 deletions(-) (limited to 'location/java/com') diff --git a/location/java/com/android/internal/location/gnssmetrics/GnssMetrics.java b/location/java/com/android/internal/location/gnssmetrics/GnssMetrics.java index 403a7667c150..0822cda04417 100644 --- a/location/java/com/android/internal/location/gnssmetrics/GnssMetrics.java +++ b/location/java/com/android/internal/location/gnssmetrics/GnssMetrics.java @@ -611,24 +611,18 @@ public class GnssMetrics { if (atomTag != FrameworkStatsLog.GNSS_STATS) { throw new UnsupportedOperationException("Unknown tagId = " + atomTag); } - StatsEvent e = StatsEvent.newBuilder() - .setAtomId(atomTag) - .writeLong(mLocationFailureReportsStatistics.getCount()) - .writeLong(mLocationFailureReportsStatistics.getLongSum()) - .writeLong(mTimeToFirstFixMilliSReportsStatistics.getCount()) - .writeLong(mTimeToFirstFixMilliSReportsStatistics.getLongSum()) - .writeLong(mPositionAccuracyMetersReportsStatistics.getCount()) - .writeLong(mPositionAccuracyMetersReportsStatistics.getLongSum()) - .writeLong(mTopFourAverageCn0DbmHzReportsStatistics.getCount()) - .writeLong(mTopFourAverageCn0DbmHzReportsStatistics.getLongSum()) - .writeLong(mL5TopFourAverageCn0DbmHzReportsStatistics.getCount()) - .writeLong(mL5TopFourAverageCn0DbmHzReportsStatistics.getLongSum()) - .writeLong(mSvStatusReports) - .writeLong(mSvStatusReportsUsedInFix) - .writeLong(mL5SvStatusReports) - .writeLong(mL5SvStatusReportsUsedInFix) - .build(); - data.add(e); + data.add(FrameworkStatsLog.buildStatsEvent(atomTag, + mLocationFailureReportsStatistics.getCount(), + mLocationFailureReportsStatistics.getLongSum(), + mTimeToFirstFixMilliSReportsStatistics.getCount(), + mTimeToFirstFixMilliSReportsStatistics.getLongSum(), + mPositionAccuracyMetersReportsStatistics.getCount(), + mPositionAccuracyMetersReportsStatistics.getLongSum(), + mTopFourAverageCn0DbmHzReportsStatistics.getCount(), + mTopFourAverageCn0DbmHzReportsStatistics.getLongSum(), + mL5TopFourAverageCn0DbmHzReportsStatistics.getCount(), + mL5TopFourAverageCn0DbmHzReportsStatistics.getLongSum(), mSvStatusReports, + mSvStatusReportsUsedInFix, mL5SvStatusReports, mL5SvStatusReportsUsedInFix)); return StatsManager.PULL_SUCCESS; } } -- cgit v1.2.3-59-g8ed1b