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

Merge "Stop passing in statsFile fds as they will be leaked when returned to the caller." into sc-dev

Browse Source
This commit is contained in:
Richard Gaywood
2021-02-08 22:21:00 +00:00
committed by Android (Google) Code Review
parent 989bc8cd01 e451771a8f
commit 098c3d746c
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/stats/pull/StatsPullAtomService.java
View File

@@ -2509,7 +2509,6 @@ public class StatsPullAtomService extends SystemService {
try {
// force procstats to flush & combine old files into one store
long lastHighWaterMark = readProcStatsHighWaterMark(section);
List<ParcelFileDescriptor> statsFiles = new ArrayList<>();
ProtoOutputStream[] protoStreams = new ProtoOutputStream[MAX_PROCSTATS_SHARDS];
for (int i = 0; i < protoStreams.length; i++) {
@@ -2519,7 +2518,7 @@ public class StatsPullAtomService extends SystemService {
ProcessStats procStats = new ProcessStats(false);
// Force processStatsService to aggregate all in-storage and in-memory data.
long highWaterMark = processStatsService.getCommittedStatsMerged(
lastHighWaterMark, section, true, statsFiles, procStats);
lastHighWaterMark, section, true, null, procStats);
procStats.dumpAggregatedProtoForStatsd(protoStreams, MAX_PROCSTATS_RAW_SHARD_SIZE);
for (int i = 0; i < protoStreams.length; i++) {