diff options
| author | 2013-12-12 23:59:37 -0800 | |
|---|---|---|
| committer | 2013-12-12 23:59:37 -0800 | |
| commit | 85948593e31157207660dcd144fa5dbe2e6b6585 (patch) | |
| tree | bee2391a5feae54a74eb291da249ad0fd04c58a9 | |
| parent | b62063316e976dd2c41d784d697e326d93f0e71c (diff) | |
| parent | 800d4d722f7b6e46bbe5bcf113afccccfad8d8ca (diff) | |
resolved conflicts for merge of 800d4d72 to master
Change-Id: Ib1defc447745e5406d64c0d99c962832c79d15ef
| -rw-r--r-- | core/jni/Android.mk | 4 | ||||
| -rw-r--r-- | core/jni/com_android_internal_net_NetworkStatsFactory.cpp | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/core/jni/Android.mk b/core/jni/Android.mk index a5589094e49d..329331a733d3 100644 --- a/core/jni/Android.mk +++ b/core/jni/Android.mk @@ -4,7 +4,9 @@ include $(CLEAR_VARS) LOCAL_CFLAGS += -DHAVE_CONFIG_H -DKHTML_NO_EXCEPTIONS -DGKWQ_NO_JAVA LOCAL_CFLAGS += -DNO_SUPPORT_JS_BINDING -DQT_NO_WHEELEVENT -DKHTML_NO_XBL LOCAL_CFLAGS += -U__APPLE__ -LOCAL_CFLAGS += -Wno-unused-parameter +LOCAL_CFLAGS += -Wno-unused-parameter -Wno-int-to-pointer-cast +LOCAL_CFLAGS += -Wno-maybe-uninitialized -Wno-parentheses +LOCAL_CPPFLAGS += -Wno-conversion-null ifeq ($(TARGET_ARCH), arm) LOCAL_CFLAGS += -DPACKED="__attribute__ ((packed))" diff --git a/core/jni/com_android_internal_net_NetworkStatsFactory.cpp b/core/jni/com_android_internal_net_NetworkStatsFactory.cpp index ec19f0ab38bc..0b9ad9b39e80 100644 --- a/core/jni/com_android_internal_net_NetworkStatsFactory.cpp +++ b/core/jni/com_android_internal_net_NetworkStatsFactory.cpp @@ -80,7 +80,7 @@ static int readNetworkStatsDetail(JNIEnv* env, jclass clazz, jobject stats, stats_line s; int64_t rawTag; 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) { if (s.idx != lastIdx + 1) { ALOGE("inconsistent idx=%d after lastIdx=%d", s.idx, lastIdx); |