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

Stop passing in statsFile fds as they will be leaked when returned to the caller.

Browse Source 
This is safe, as getCommittedStatsMerged() supports null-able values for the List<ParcelFileDescriptor>.

Test: local compile and test; atom still pulls successfully.
Change-Id: I083ea1150f54c5970fbf60ae320809d27c4f3207
Bug: 179008261
This commit is contained in:
Richard Gaywood
2021-02-05 15:53:00 +00:00
parent 9e8fef20a7
commit e451771a8f
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 { try {
// force procstats to flush & combine old files into one store // force procstats to flush & combine old files into one store
long lastHighWaterMark = readProcStatsHighWaterMark(section); long lastHighWaterMark = readProcStatsHighWaterMark(section);
List<ParcelFileDescriptor> statsFiles = new ArrayList<>();
ProtoOutputStream[] protoStreams = new ProtoOutputStream[MAX_PROCSTATS_SHARDS]; ProtoOutputStream[] protoStreams = new ProtoOutputStream[MAX_PROCSTATS_SHARDS];
for (int i = 0; i < protoStreams.length; i++) { for (int i = 0; i < protoStreams.length; i++) {
@@ -2519,7 +2518,7 @@ public class StatsPullAtomService extends SystemService {
ProcessStats procStats = new ProcessStats(false); ProcessStats procStats = new ProcessStats(false);
// Force processStatsService to aggregate all in-storage and in-memory data. // Force processStatsService to aggregate all in-storage and in-memory data.
long highWaterMark = processStatsService.getCommittedStatsMerged( long highWaterMark = processStatsService.getCommittedStatsMerged(
lastHighWaterMark, section, true, statsFiles, procStats); lastHighWaterMark, section, true, null, procStats);
procStats.dumpAggregatedProtoForStatsd(protoStreams, MAX_PROCSTATS_RAW_SHARD_SIZE); procStats.dumpAggregatedProtoForStatsd(protoStreams, MAX_PROCSTATS_RAW_SHARD_SIZE);
for (int i = 0; i < protoStreams.length; i++) { for (int i = 0; i < protoStreams.length; i++) {