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

Pivot network statistics to use DataInput/Output.

Browse Source 
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
This commit is contained in:
Jeff Sharkey
2021-01-19 10:47:55 -07:00
parent 60ec82fcf1
commit 4b428016aa
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
services/core/java/com/android/server/net/NetworkStatsCollection.java
View File

@@ -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 {