LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Return non-negetive value in getMobileStats method

Browse Source 
The current implementation of getMobileRxBytes and all the similiar
method adds up the return values for multiple calls to getRxBytes so if
all of them return UNSUPPORTED for any reason, getMobileRxBytes() would
return a value such as -3. This behavior is not compliance with the cts
TrafficStatsTest which always assume getMobileRxBytes to return a
non-negetive value. The method now will check tha stats get from
getRxBytes method and add them up only if the stats is valid.

Bug: 72473294
Test: run cts -m CtsNetTestCases -t android.net.cts.TrafficStatsTest
Change-Id: I656970ebc8f6506cf17c4353ad46c0178bb65cfd
This commit is contained in:
Chenbo Feng
2018-01-25 11:43:52 -08:00
parent b559164017
commit 905f034c57
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 * Return number of packets transmitted across mobile networks since device
* boot. Counts packets across all mobile network interfaces, and always * boot. Counts packets across all mobile network interfaces, and always
@@ -445,7 +449,7 @@ public class TrafficStats {
public static long getMobileTxPackets() { public static long getMobileTxPackets() {
long total = 0; long total = 0;
for (String iface : getMobileIfaces()) { for (String iface : getMobileIfaces()) {
total += getTxPackets(iface); total += addIfSupported(getTxPackets(iface));
} }
return total; return total;
} }
@@ -462,7 +466,7 @@ public class TrafficStats {
public static long getMobileRxPackets() { public static long getMobileRxPackets() {
long total = 0; long total = 0;
for (String iface : getMobileIfaces()) { for (String iface : getMobileIfaces()) {
total += getRxPackets(iface); total += addIfSupported(getRxPackets(iface));
} }
return total; return total;
} }
@@ -479,7 +483,7 @@ public class TrafficStats {
public static long getMobileTxBytes() { public static long getMobileTxBytes() {
long total = 0; long total = 0;
for (String iface : getMobileIfaces()) { for (String iface : getMobileIfaces()) {
total += getTxBytes(iface); total += addIfSupported(getTxBytes(iface));
} }
return total; return total;
} }
@@ -496,7 +500,7 @@ public class TrafficStats {
public static long getMobileRxBytes() { public static long getMobileRxBytes() {
long total = 0; long total = 0;
for (String iface : getMobileIfaces()) { for (String iface : getMobileIfaces()) {
total += getRxBytes(iface); total += addIfSupported(getRxBytes(iface));
} }
return total; return total;
} }
@@ -511,9 +515,7 @@ public class TrafficStats {
} catch (RemoteException e) { } catch (RemoteException e) {
throw e.rethrowFromSystemServer(); throw e.rethrowFromSystemServer();
} }
if (stat != UNSUPPORTED) { total += addIfSupported(stat);
total += stat;
}
} }
return total; return total;
} }
@@ -528,9 +530,7 @@ public class TrafficStats {
} catch (RemoteException e) { } catch (RemoteException e) {
throw e.rethrowFromSystemServer(); throw e.rethrowFromSystemServer();
} }
if (stat != UNSUPPORTED) { total += addIfSupported(stat);
total += stat;
}
} }
return total; return total;
} }