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

Commit a19fe930 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Revert "Pivot network statistics to use DataInput/Output."" am: c170ac33 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1948916

Change-Id: I0f50460688b434522476a2160f3884e897dafad6
parents 1529463a c170ac33

packages/ConnectivityT/framework-t/src/android/net/NetworkStatsCollection.java

+4 −10
Original line number Diff line number Diff line
@@ -46,8 +46,6 @@ import android.util.Range; 
import android.util.proto.ProtoOutputStream;



import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.util.FastDataInput;

import com.android.internal.util.FastDataOutput;

import com.android.internal.util.FileRotator;

import com.android.net.module.util.CollectionUtils;

import com.android.net.module.util.NetworkStatsUtils;
@@ -58,6 +56,7 @@ import java.io.BufferedInputStream; 
import java.io.DataInput;

import java.io.DataInputStream;

import java.io.DataOutput;

import java.io.DataOutputStream;

import java.io.File;

import java.io.FileNotFoundException;

import java.io.IOException;
@@ -83,9 +82,6 @@ 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;
@@ -439,8 +435,7 @@ public class NetworkStatsCollection implements FileRotator.Reader, FileRotator.W 


    @Override

    public void read(InputStream in) throws IOException {

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

        read(dataIn);

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

    }



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


    @Override

    public void write(OutputStream out) throws IOException {

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

        write(dataOut);

        dataOut.flush();

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

        out.flush();

    }



    private void write(DataOutput out) throws IOException {