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

Commit 19c43a01 authored by TreeHugger Robot's avatar TreeHugger Robot 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 rvc-qpr-dev
parents 1639387a 5ac20344

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

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