Merge "Return non-negetive value in getMobileStats method" am: bb1d07e681 am: 515a54a93e (690a5984) · Commits · e / os / android_frameworks_base

core/java/android/net/TrafficStats.java

+10 −10

Original line number	Diff line number	Diff line
		@@ -439,6 +439,10 @@ public class TrafficStats {
		}
		}

		private static long addIfSupported(long stat) {
		return (stat == UNSUPPORTED) ? 0 : stat;
		}

		/**
		* Return number of packets transmitted across mobile networks since device
		* boot. Counts packets across all mobile network interfaces, and always
		@@ -451,7 +455,7 @@ public class TrafficStats {
		public static long getMobileTxPackets() {
		long total = 0;
		for (String iface : getMobileIfaces()) {
		total += getTxPackets(iface);
		total += addIfSupported(getTxPackets(iface));
		}
		return total;
		}
		@@ -468,7 +472,7 @@ public class TrafficStats {
		public static long getMobileRxPackets() {
		long total = 0;
		for (String iface : getMobileIfaces()) {
		total += getRxPackets(iface);
		total += addIfSupported(getRxPackets(iface));
		}
		return total;
		}
		@@ -485,7 +489,7 @@ public class TrafficStats {
		public static long getMobileTxBytes() {
		long total = 0;
		for (String iface : getMobileIfaces()) {
		total += getTxBytes(iface);
		total += addIfSupported(getTxBytes(iface));
		}
		return total;
		}
		@@ -502,7 +506,7 @@ public class TrafficStats {
		public static long getMobileRxBytes() {
		long total = 0;
		for (String iface : getMobileIfaces()) {
		total += getRxBytes(iface);
		total += addIfSupported(getRxBytes(iface));
		}
		return total;
		}
		@@ -517,9 +521,7 @@ public class TrafficStats {
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		if (stat != UNSUPPORTED) {
		total += stat;
		}
		total += addIfSupported(stat);
		}
		return total;
		}
		@@ -534,9 +536,7 @@ public class TrafficStats {
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		if (stat != UNSUPPORTED) {
		total += stat;
		}
		total += addIfSupported(stat);
		}
		return total;
		}