| commit | 3d6843c6149d04a60383df8a4130701db488a5de | [log] [tgz] |
|---|---|---|
| author | Maciej Żenczykowski <maze@google.com> | Thu Jun 02 01:52:01 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jun 02 01:52:01 2022 +0000 |
| tree | 139afb20c98bcef719d4bf892de1fd036eabd2ef | |
| parent | b9401c39a64f2b5a666fbc1fdfc9c58bf4f5c099 [diff] | |
| parent | 013767a0b72eaeb09422bfbb30c6522638647cee [diff] |
Merge "BpfMap: simplify .init() mMapFd assignment" am: cbd9abcc21 Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/2113946 Change-Id: Ia894525837286366702cd7908bcefaf0fead4d60 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/staticlibs/native/bpf_headers/include/bpf/BpfMap.h b/staticlibs/native/bpf_headers/include/bpf/BpfMap.h index d07d610..86c0756 100644 --- a/staticlibs/native/bpf_headers/include/bpf/BpfMap.h +++ b/staticlibs/native/bpf_headers/include/bpf/BpfMap.h
@@ -196,7 +196,7 @@ template <class Key, class Value> base::Result<void> BpfMap<Key, Value>::init(const char* path) { - mMapFd = base::unique_fd(mapRetrieveRW(path)); + mMapFd.reset(mapRetrieveRW(path)); if (mMapFd == -1) { return ErrnoErrorf("Pinned map not accessible or does not exist: ({})", path); }