diff options
| author | Kristian Monsen <kristianm@google.com> | 2013-12-13 06:32:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-12-13 06:32:03 +0000 |
| commit | 584ace0d3f79ff43db9298798065dd5beaa66a45 (patch) | |
| tree | 802c37cfa86645107ec54ff4441ca472d52b1fc4 | |
| parent | fc2f459c522448331b79c388e9f7b19f72650586 (diff) | |
| parent | f5fabdf83d2a1b30fcbd2a25882f98e282e4f762 (diff) | |
| download | frameworks_base-584ace0d3f79ff43db9298798065dd5beaa66a45.zip frameworks_base-584ace0d3f79ff43db9298798065dd5beaa66a45.tar.gz frameworks_base-584ace0d3f79ff43db9298798065dd5beaa66a45.tar.bz2 | |
Merge "Fix one and hide the other warnings from core/jni"
| -rw-r--r-- | core/jni/Android.mk | 3 | ||||
| -rw-r--r-- | core/jni/com_android_internal_net_NetworkStatsFactory.cpp | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/core/jni/Android.mk b/core/jni/Android.mk index 1958584..2e0acb1 100644 --- a/core/jni/Android.mk +++ b/core/jni/Android.mk @@ -4,6 +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 -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 ec19f0a..0b9ad9b 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); |