| commit | d98bd6525e69cb00b1ebd4bb1d222d153f11f263 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Tue Feb 07 18:37:44 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Feb 07 18:37:44 2023 +0000 |
| tree | 4523a531ca63fcb6f8c0b6c430fedbf88bf4383b | |
| parent | fbdca2a1c6c43af6b02a17eb49b0e50f66994e65 [diff] | |
| parent | 8154deb5d618e0be28584bebf8e2d86fb450e92b [diff] |
Merge "remove unused combineUidTag()" am: 8154deb5d6 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2423766 Change-Id: I6c293eddd227218ba7f7cd038a105f4137b6819a 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());