Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 098c3d74 authored by Richard Gaywood's avatar Richard Gaywood Committed by Android (Google) Code Review
Browse files

Merge "Stop passing in statsFile fds as they will be leaked when returned to... 

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

services/core/java/com/android/server/stats/pull/StatsPullAtomService.java

+1 −2
Original line number Original line Diff line number Diff line
@@ -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++) {