| commit | e26357e821b65ce793839ce9fb01a176de1442ee | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Tue Feb 07 19:17:39 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Feb 07 19:17:39 2023 +0000 |
| tree | a520d6e619ded8e21fcbc6df5b993aabc903e6ac | |
| parent | 7d1c507f55ac65dce7842c1a7c5a04cb6e9ffae6 [diff] | |
| parent | d98bd6525e69cb00b1ebd4bb1d222d153f11f263 [diff] |
Merge "remove unused combineUidTag()" am: 8154deb5d6 am: d98bd6525e Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2423766 Change-Id: I5d7598fb751db11bab44c38f333db0dffe0434a8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/service-t/native/libs/libnetworkstats/BpfNetworkStats.cpp b/service-t/native/libs/libnetworkstats/BpfNetworkStats.cpp index 122c2d4..4fbc5f4 100644 --- a/service-t/native/libs/libnetworkstats/BpfNetworkStats.cpp +++ b/service-t/native/libs/libnetworkstats/BpfNetworkStats.cpp
@@ -247,10 +247,6 @@ return parseBpfNetworkStatsDevInternal(lines, ifaceStatsMap, ifaceIndexNameMap); } -uint64_t combineUidTag(const uid_t uid, const uint32_t tag) { - return (uint64_t)uid << 32 | tag; -} - void groupNetworkStats(std::vector<stats_line>* lines) { if (lines->size() <= 1) return; std::sort(lines->begin(), lines->end());