diff options
| author | 2022-01-15 13:50:42 +0000 | |
|---|---|---|
| committer | 2022-01-15 13:50:42 +0000 | |
| commit | a19fe930febb2a15b9fd65a4f30dc86d6caa7cc2 (patch) | |
| tree | e204494e2a924734d331bab31370239f880faee9 | |
| parent | 1529463a7896dbf6e29cf33712937d90040af358 (diff) | |
| parent | c170ac33a2dc05166e960f29cb59f42306eb1b6b (diff) | |
Merge "Revert "Pivot network statistics to use DataInput/Output."" am: c170ac33a2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1948916
Change-Id: I0f50460688b434522476a2160f3884e897dafad6
| -rw-r--r-- | packages/ConnectivityT/framework-t/src/android/net/NetworkStatsCollection.java | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/packages/ConnectivityT/framework-t/src/android/net/NetworkStatsCollection.java b/packages/ConnectivityT/framework-t/src/android/net/NetworkStatsCollection.java index 7935d28f305d..9f9d73f88851 100644 --- a/packages/ConnectivityT/framework-t/src/android/net/NetworkStatsCollection.java +++ b/packages/ConnectivityT/framework-t/src/android/net/NetworkStatsCollection.java @@ -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 { |