Merge "Add getter for the fields of NetworkStats.Entry" am: b3f2eeaeaa am:... (1160122a) · Commits · e / os / android_frameworks_base

core/api/system-current.txt

+11 −0

Original line number	Diff line number	Diff line
		@@ -7598,6 +7598,17 @@ package android.net {

		public static class NetworkStats.Entry {
		ctor public NetworkStats.Entry(@Nullable String, int, int, int, int, int, int, long, long, long, long, long);
		method public int getDefaultNetwork();
		method public int getMetered();
		method public long getOperations();
		method public int getRoaming();
		method public long getRxBytes();
		method public long getRxPackets();
		method public int getSet();
		method public int getTag();
		method public long getTxBytes();
		method public long getTxPackets();
		method public int getUid();
		}

		public class RssiCurve implements android.os.Parcelable {

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

+90 −1

Original line number	Diff line number	Diff line
		@@ -383,6 +383,95 @@ public final class NetworkStats implements Parcelable {
		this.operations += another.operations;
		}

		/**
		* @return interface name of this entry.
		* @hide
		*/
		@Nullable public String getIface() {
		return iface;
		}

		/**
		* @return the uid of this entry.
		*/
		public int getUid() {
		return uid;
		}

		/**
		* @return the set state of this entry. Should be one of the following
		* values: {@link #SET_DEFAULT}, {@link #SET_FOREGROUND}.
		*/
		@State public int getSet() {
		return set;
		}

		/**
		* @return the tag value of this entry.
		*/
		public int getTag() {
		return tag;
		}

		/**
		* @return the metered state. Should be one of the following
		* values: {link #METERED_YES}, {link #METERED_NO}.
		*/
		@Meteredness public int getMetered() {
		return metered;
		}

		/**
		* @return the roaming state. Should be one of the following
		* values: {link #ROAMING_YES}, {link #ROAMING_NO}.
		*/
		@Roaming public int getRoaming() {
		return roaming;
		}

		/**
		* @return the default network state. Should be one of the following
		* values: {link #DEFAULT_NETWORK_YES}, {link #DEFAULT_NETWORK_NO}.
		*/
		@DefaultNetwork public int getDefaultNetwork() {
		return defaultNetwork;
		}

		/**
		* @return the number of received bytes.
		*/
		public long getRxBytes() {
		return rxBytes;
		}

		/**
		* @return the number of received packets.
		*/
		public long getRxPackets() {
		return rxPackets;
		}

		/**
		* @return the number of transmitted bytes.
		*/
		public long getTxBytes() {
		return txBytes;
		}

		/**
		* @return the number of transmitted packets.
		*/
		public long getTxPackets() {
		return txPackets;
		}

		/**
		* @return the count of network operations performed for this entry.
		*/
		public long getOperations() {
		return operations;
		}

		@Override
		public String toString() {
		final StringBuilder builder = new StringBuilder();
		@@ -593,7 +682,7 @@ public final class NetworkStats implements Parcelable {
		* @hide
		*/
		@UnsupportedAppUsage
		public Entry getValues(int i, Entry recycle) {
		public Entry getValues(int i, @Nullable Entry recycle) {
		final Entry entry = recycle != null ? recycle : new Entry();
		entry.iface = iface[i];
		entry.uid = uid[i];