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

Commit 4b428016 authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

Pivot network statistics to use DataInput/Output. 

The majority of this refactoring has already landed in AOSP, and this
small CL is the remaining piece needed to begin using the new
optimized classes which only exist in the internal tree.

This is a no-op refactoring.

Bug: 176777285
Test: atest FrameworksNetTests CtsNetTestCases
Change-Id: Ifd7ac95c6cd6761e7d03cbf381dcc9e32b6406aa
parent 60ec82fc

services/core/java/com/android/server/net/NetworkStatsCollection.java

+10 −3
Original line number Diff line number Diff line
@@ -54,6 +54,8 @@ import android.util.proto.ProtoOutputStream; 


import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.util.ArrayUtils;

import com.android.internal.util.FastDataInput;

import com.android.internal.util.FastDataOutput;

import com.android.internal.util.FileRotator;

import com.android.internal.util.IndentingPrintWriter;
@@ -89,6 +91,9 @@ public class NetworkStatsCollection implements FileRotator.Reader, FileRotator.W 
    /** File header magic number: "ANET" */

    private static final int FILE_MAGIC = 0x414E4554;



    /** Default buffer size from BufferedInputStream */

    private static final int BUFFER_SIZE = 8192;



    private static final int VERSION_NETWORK_INIT = 1;



    private static final int VERSION_UID_INIT = 1;
@@ -434,7 +439,8 @@ public class NetworkStatsCollection implements FileRotator.Reader, FileRotator.W 


    @Override

    public void read(InputStream in) throws IOException {

        read((DataInput) new DataInputStream(in));

        final FastDataInput dataIn = new FastDataInput(in, BUFFER_SIZE);

        read(dataIn);

    }



    private void read(DataInput in) throws IOException {
@@ -473,8 +479,9 @@ public class NetworkStatsCollection implements FileRotator.Reader, FileRotator.W 


    @Override

    public void write(OutputStream out) throws IOException {

        write((DataOutput) new DataOutputStream(out));

        out.flush();

        final FastDataOutput dataOut = new FastDataOutput(out, BUFFER_SIZE);

        write(dataOut);

        dataOut.flush();

    }



    private void write(DataOutput out) throws IOException {