Merge "Remove obsolete NetworkStats.Entry constructor." am: ebb1d92eb8

am: cdeb50aa48

Change-Id: If60b58f95707bab3ae89050234226d54386398e8
This commit is contained in:
Lorenzo Colitti
2018-01-23 02:23:32 +00:00
committed by android-build-merger

View File

@@ -160,13 +160,6 @@ public class NetworkStats implements Parcelable {
rxBytes, rxPackets, txBytes, txPackets, operations); rxBytes, rxPackets, txBytes, txPackets, operations);
} }
// TODO: fix the the telephony code to pass DEFAULT_NETWORK_YES and remove this constructor.
public Entry(String iface, int uid, int set, int tag, int metered, int roaming,
long rxBytes, long rxPackets, long txBytes, long txPackets, long operations) {
this(iface, uid, set, tag, metered, roaming, DEFAULT_NETWORK_YES, rxBytes, rxPackets,
txBytes, txPackets, operations);
}
public Entry(String iface, int uid, int set, int tag, int metered, int roaming, public Entry(String iface, int uid, int set, int tag, int metered, int roaming,
int defaultNetwork, long rxBytes, long rxPackets, long txBytes, long txPackets, int defaultNetwork, long rxBytes, long rxPackets, long txBytes, long txPackets,
long operations) { long operations) {