joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Return non-negetive value in getMobileStats method"

Browse source
This commit is contained in:
Treehugger Robot 2018-02-02 04:22:34 +00:00 • committed by Gerrit Code Review
commit 9fb04e29e5
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
core/java/android/net/TrafficStats.java
View file

@ -433,6 +433,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
@ -445,7 +449,7 @@ public class TrafficStats {
public static long getMobileTxPackets() {
long total = 0;
for (String iface : getMobileIfaces()) {
total += getTxPackets(iface);
total += addIfSupported(getTxPackets(iface));
}
return total;
}
@ -462,7 +466,7 @@ public class TrafficStats {
public static long getMobileRxPackets() {
long total = 0;
for (String iface : getMobileIfaces()) {
total += getRxPackets(iface);
total += addIfSupported(getRxPackets(iface));
}
return total;
}
@ -479,7 +483,7 @@ public class TrafficStats {
public static long getMobileTxBytes() {
long total = 0;
for (String iface : getMobileIfaces()) {
total += getTxBytes(iface);
total += addIfSupported(getTxBytes(iface));
}
return total;
}
@ -496,7 +500,7 @@ public class TrafficStats {
public static long getMobileRxBytes() {
long total = 0;
for (String iface : getMobileIfaces()) {
total += getRxBytes(iface);
total += addIfSupported(getRxBytes(iface));
}
return total;
}
@ -511,9 +515,7 @@ public class TrafficStats {
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
}
if (stat != UNSUPPORTED) {
total += stat;
}
total += addIfSupported(stat);
}
return total;
}
@ -528,9 +530,7 @@ public class TrafficStats {
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
}
if (stat != UNSUPPORTED) {
total += stat;
}
total += addIfSupported(stat);
}
return total;
}