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

resolved conflicts for merge of 800d4d72 to master

Browse Source 
Change-Id: Ib1defc447745e5406d64c0d99c962832c79d15ef
This commit is contained in:
Kristian Monsen
2013-12-12 23:59:37 -08:00
parent 84ae0f4bc6 fb4d3e7a4a
commit 57dfa66b95
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/jni/com_android_internal_net_NetworkStatsFactory.cpp
View File

@@ -80,7 +80,7 @@ static int readNetworkStatsDetail(JNIEnv* env, jclass clazz, jobject stats,
stats_line s; stats_line s;
int64_t rawTag; int64_t rawTag;
if (sscanf(buffer, "%d %31s 0x%llx %u %u %llu %llu %llu %llu", &s.idx, if (sscanf(buffer, "%d %31s 0x%llx %u %u %llu %llu %llu %llu", &s.idx,
&s.iface, &rawTag, &s.uid, &s.set, &s.rxBytes, &s.rxPackets, s.iface, &rawTag, &s.uid, &s.set, &s.rxBytes, &s.rxPackets,
&s.txBytes, &s.txPackets) == 9) { &s.txBytes, &s.txPackets) == 9) {
if (s.idx != lastIdx + 1) { if (s.idx != lastIdx + 1) {
ALOGE("inconsistent idx=%d after lastIdx=%d", s.idx, lastIdx); ALOGE("inconsistent idx=%d after lastIdx=%d", s.idx, lastIdx);