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

am: 2c0a0092f1

Change-Id: I82da681df48cd6425bbfb962d3969fa236e9db29
This commit is contained in:
Junyu Lai
2018-11-13 01:37:17 -08:00
committed by android-build-merger

View File

@@ -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;
}