commit 2c0a0092f15c97034c0bc61706fb21e5837e822e
author Junyu Lai <junyulai@google.com> Tue Nov 13 09:15:37 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Nov 13 09:15:37 2018 +0000
tree 71993555713adf7b3fc4e58e10d3d1269fe82ef1
parent a97bdb957f3526d03314bdc894a3632ca208777f
parent 5aa232e4aeb8cdf749da31a2501aeb3af914120d

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

core/jni/com_android_internal_net_NetworkStatsFactory.cpp

diff --git a/core/jni/com_android_internal_net_NetworkStatsFactory.cpp b/core/jni/com_android_internal_net_NetworkStatsFactory.cpp
index b3ff4db..b708735 100644
--- a/core/jni/com_android_internal_net_NetworkStatsFactory.cpp
+++ b/core/jni/com_android_internal_net_NetworkStatsFactory.cpp
@@ -175,7 +175,7 @@
             }
         }
         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 @@
         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;
             }