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 rvc-qpr-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-02-15 22:34:02 +00:00
committed by Android (Google) Code Review
parent 1639387a8e 5ac203445f
commit 19c43a01a7
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

@@ -2610,7 +2610,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++) {
@@ -2620,7 +2619,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++) {