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

Commit faaaf809 authored by Junyu Lai's avatar Junyu Lai Committed by android-build-merger
Browse files

Merge "Change types of fields of network stats reported to framework." am:... 

Merge "Change types of fields of network stats reported to framework." am: 2c0a0092 am: c53ca081
am: 1b77ce48

Change-Id: Iab166b8b06d3a744b8cfc83e0467c478642ce185
parents c09f4ee4 1b77ce48

core/jni/com_android_internal_net_NetworkStatsFactory.cpp

+2 −2
Original line number Diff line number Diff line
@@ -175,7 +175,7 @@ static int legacyReadNetworkStatsDetail(std::vector<stats_line>* lines, 
            }

        }

        s.tag = rawTag >> 32;

        if (limitTag != -1 && s.tag != limitTag) {

        if (limitTag != -1 && s.tag != static_cast<uint32_t>(limitTag)) {

            //ALOGI("skipping due to tag: %s", buffer);

            continue;

        }
@@ -188,7 +188,7 @@ static int legacyReadNetworkStatsDetail(std::vector<stats_line>* lines, 
        if (sscanf(pos, "%u %u %" PRIu64 " %" PRIu64 " %" PRIu64 " %" PRIu64,

                &s.uid, &s.set, &s.rxBytes, &s.rxPackets,

                &s.txBytes, &s.txPackets) == 6) {

            if (limitUid != -1 && limitUid != s.uid) {

            if (limitUid != -1 && static_cast<uint32_t>(limitUid) != s.uid) {

                //ALOGI("skipping due to uid: %s", buffer);

                continue;

            }