Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 13b648eb authored by Kristian Monsen's avatar Kristian Monsen Committed by Android Git Automerger
Browse files

am 584ace0d: Merge "Fix one and hide the other warnings from core/jni" 

* commit '584ace0d':
  Fix one and hide the other warnings from core/jni
parents 2a288bab 584ace0d

core/jni/Android.mk

+3 −0
Original line number Diff line number Diff line
@@ -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))"

core/jni/com_android_internal_net_NetworkStatsFactory.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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);