diff options
| author | 2022-01-13 06:24:56 +0000 | |
|---|---|---|
| committer | 2022-01-13 06:24:56 +0000 | |
| commit | 2a30ec9975740d6c5fb5e34a4960a262ccc00e59 (patch) | |
| tree | e027bb0137012d15b9e15191d02f87d3d7d20395 | |
| parent | bd805bbc243d5763959fdb879d3f89ec5decdadd (diff) | |
| parent | cfdc49a4917c931025aa4e7a0a6b0d52cc7f37cc (diff) | |
Merge "Add tagSocket/untagSocket NDK APIs" am: d992ee2925 am: 358573e8a3 am: cfdc49a491
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1938795
Change-Id: I1c005cbc1d888310e17c6105c0dd2457d4cc1c86
| -rw-r--r-- | native/android/libandroid_net.map.txt | 4 | ||||
| -rw-r--r-- | native/android/net.c | 12 |
2 files changed, 16 insertions, 0 deletions
diff --git a/native/android/libandroid_net.map.txt b/native/android/libandroid_net.map.txt index a6c1b5098066..32fd734d61a0 100644 --- a/native/android/libandroid_net.map.txt +++ b/native/android/libandroid_net.map.txt @@ -18,6 +18,10 @@ LIBANDROID_NET { android_getprocnetwork; # llndk android_setprocdns; # llndk android_getprocdns; # llndk + # These functions have been part of the NDK since API 33. + android_tag_socket_with_uid; # llndk + android_tag_socket; # llndk + android_untag_socket; # llndk local: *; }; diff --git a/native/android/net.c b/native/android/net.c index e2f36a77b7c6..d7c22e1a5741 100644 --- a/native/android/net.c +++ b/native/android/net.c @@ -161,3 +161,15 @@ int android_res_nsend(net_handle_t network, const uint8_t *msg, size_t msglen, void android_res_cancel(int nsend_fd) { resNetworkCancel(nsend_fd); } + +int android_tag_socket_with_uid(int sockfd, int tag, uid_t uid) { + return tagSocket(sockfd, tag, uid); +} + +int android_tag_socket(int sockfd, int tag) { + return tagSocket(sockfd, tag, -1); +} + +int android_untag_socket(int sockfd) { + return untagSocket(sockfd); +} |