Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Treehugger Robot
2022-01-15 13:25:40 +00:00
committed by Gerrit Code Review
parent ea6321a171 0ca70fff40
commit c170ac33a2
1 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -46,8 +46,6 @@ import android.util.Range;
import android.util.proto.ProtoOutputStream; import android.util.proto.ProtoOutputStream;
import com.android.internal.annotations.VisibleForTesting; 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.internal.util.FileRotator;
import com.android.net.module.util.CollectionUtils; import com.android.net.module.util.CollectionUtils;
import com.android.net.module.util.NetworkStatsUtils; import com.android.net.module.util.NetworkStatsUtils;
@@ -58,6 +56,7 @@ import java.io.BufferedInputStream;
import java.io.DataInput; import java.io.DataInput;
import java.io.DataInputStream; import java.io.DataInputStream;
import java.io.DataOutput; import java.io.DataOutput;
import java.io.DataOutputStream;
import java.io.File; import java.io.File;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import java.io.IOException; import java.io.IOException;
@@ -83,9 +82,6 @@ public class NetworkStatsCollection implements FileRotator.Reader, FileRotator.W
/** File header magic number: "ANET" */ /** File header magic number: "ANET" */
private static final int FILE_MAGIC = 0x414E4554; 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_NETWORK_INIT = 1;
private static final int VERSION_UID_INIT = 1; private static final int VERSION_UID_INIT = 1;
@@ -439,8 +435,7 @@ public class NetworkStatsCollection implements FileRotator.Reader, FileRotator.W
@Override @Override
public void read(InputStream in) throws IOException { public void read(InputStream in) throws IOException {
final FastDataInput dataIn = new FastDataInput(in, BUFFER_SIZE); read((DataInput) new DataInputStream(in));
read(dataIn);
} }
private void read(DataInput in) throws IOException { private void read(DataInput in) throws IOException {
@@ -479,9 +474,8 @@ public class NetworkStatsCollection implements FileRotator.Reader, FileRotator.W
@Override @Override
public void write(OutputStream out) throws IOException { public void write(OutputStream out) throws IOException {
final FastDataOutput dataOut = new FastDataOutput(out, BUFFER_SIZE); write((DataOutput) new DataOutputStream(out));
write(dataOut); out.flush();
dataOut.flush();
} }
private void write(DataOutput out) throws IOException { private void write(DataOutput out) throws IOException {