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

Merge "NetworkStats: more robust subtraction for deltas" into oc-dr1-dev am: 5e24152e33

Browse Source 
am: b9d28344e0

Change-Id: I67d5dc4b52b254748ff17fe1e16c2eeb1d03c30d
This commit is contained in:
Hugo Benichi
2017-08-08 16:10:52 +00:00
committed by android-build-merger
parent 37d178c71e b9d28344e0
commit ae3ee131d2
1 changed files with 21 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
core/java/android/net/NetworkStats.java
View File

@@ -672,27 +672,25 @@ public class NetworkStats implements Parcelable {
entry.tag = left.tag[i]; entry.tag = left.tag[i];
entry.metered = left.metered[i]; entry.metered = left.metered[i];
entry.roaming = left.roaming[i]; entry.roaming = left.roaming[i];
// find remote row that matches, and subtract
final int j = right.findIndexHinted(entry.iface, entry.uid, entry.set, entry.tag,
entry.metered, entry.roaming, i);
if (j == -1) {
// newly appearing row, return entire value
entry.rxBytes = left.rxBytes[i]; entry.rxBytes = left.rxBytes[i];
entry.rxPackets = left.rxPackets[i]; entry.rxPackets = left.rxPackets[i];
entry.txBytes = left.txBytes[i]; entry.txBytes = left.txBytes[i];
entry.txPackets = left.txPackets[i]; entry.txPackets = left.txPackets[i];
entry.operations = left.operations[i]; entry.operations = left.operations[i];
} else {
// existing row, subtract remote value
entry.rxBytes = left.rxBytes[i] - right.rxBytes[j];
entry.rxPackets = left.rxPackets[i] - right.rxPackets[j];
entry.txBytes = left.txBytes[i] - right.txBytes[j];
entry.txPackets = left.txPackets[i] - right.txPackets[j];
entry.operations = left.operations[i] - right.operations[j];
if (entry.rxBytes < 0 || entry.rxPackets < 0 || entry.txBytes < 0 // find remote row that matches, and subtract
|| entry.txPackets < 0 || entry.operations < 0) { final int j = right.findIndexHinted(entry.iface, entry.uid, entry.set, entry.tag,
entry.metered, entry.roaming, i);
if (j != -1) {
// Found matching row, subtract remote value.
entry.rxBytes -= right.rxBytes[j];
entry.rxPackets -= right.rxPackets[j];
entry.txBytes -= right.txBytes[j];
entry.txPackets -= right.txPackets[j];
entry.operations -= right.operations[j];
}
if (entry.isNegative()) {
if (observer != null) { if (observer != null) {
observer.foundNonMonotonic(left, i, right, j, cookie); observer.foundNonMonotonic(left, i, right, j, cookie);
} }
@@ -702,7 +700,6 @@ public class NetworkStats implements Parcelable {
entry.txPackets = Math.max(entry.txPackets, 0); entry.txPackets = Math.max(entry.txPackets, 0);
entry.operations = Math.max(entry.operations, 0); entry.operations = Math.max(entry.operations, 0);
} }
}
result.addValues(entry); result.addValues(entry);
} }