| commit | d2d2a27a4c127c9ecd77c4f64c0308c3811a7bda | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Tue Feb 07 19:20:07 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Feb 07 19:20:07 2023 +0000 |
| tree | ea45ba4495b59986317ce820eeb78ca0c3f0cea8 | |
| parent | 5634050e0261090a54109766cd03cd8526b91f03 [diff] | |
| parent | 47d83bdf588eaf2254a34042517227d27541295d [diff] |
Merge "remove unused combineUidTag()" am: 8154deb5d6 am: 47d83bdf58 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2423766 Change-Id: I7c5a3d23cdac22064a50a6e874481f1d80a3db38 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());