diff options
| author | 2022-03-31 03:48:21 +0000 | |
|---|---|---|
| committer | 2022-03-31 03:48:21 +0000 | |
| commit | 292d5f01ec54c27ea3997dfae0b723b9313ba4b0 (patch) | |
| tree | b3adced1b78909600032561577fd9a22084efa3a | |
| parent | 5f207e3faf884db5060995361116f3ceff7a8f58 (diff) | |
| parent | aa82affbc0479757a6d2adeaabef26fde19b3368 (diff) | |
Merge "Update data type and comments on tagSocket/untagSocket APIs" am: ef89731cd3 am: aa82affbc0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2049804
Change-Id: I44cf6b9d99222a26643b319710b06f5f33df8ae3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | native/android/libandroid_net.map.txt | 8 | ||||
| -rw-r--r-- | native/android/net.c | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/native/android/libandroid_net.map.txt b/native/android/libandroid_net.map.txt index 32fd734d61a0..e9acdae4576a 100644 --- a/native/android/libandroid_net.map.txt +++ b/native/android/libandroid_net.map.txt @@ -5,20 +5,20 @@ # which might be a few years old. LIBANDROID_NET { global: - # These functions have been part of the NDK since API 24. + # These functions have been part of the LL-NDK since API 24. android_getaddrinfofornetwork; # llndk android_setsocknetwork; # llndk android_setprocnetwork; # llndk - # These functions have been part of the NDK since API 29. + # These functions have been part of the LL-NDK since API 29. android_res_cancel; # llndk android_res_nquery; # llndk android_res_nresult; # llndk android_res_nsend; # llndk - # These functions have been part of the NDK since API 31. + # These functions have been part of the LL-NDK since API 31. android_getprocnetwork; # llndk android_setprocdns; # llndk android_getprocdns; # llndk - # These functions have been part of the NDK since API 33. + # These functions have been part of the LL-NDK since API 33. android_tag_socket_with_uid; # llndk android_tag_socket; # llndk android_untag_socket; # llndk diff --git a/native/android/net.c b/native/android/net.c index d7c22e1a5741..74db1845080b 100644 --- a/native/android/net.c +++ b/native/android/net.c @@ -162,11 +162,11 @@ void android_res_cancel(int nsend_fd) { resNetworkCancel(nsend_fd); } -int android_tag_socket_with_uid(int sockfd, int tag, uid_t uid) { +int android_tag_socket_with_uid(int sockfd, uint32_t tag, uid_t uid) { return tagSocket(sockfd, tag, uid); } -int android_tag_socket(int sockfd, int tag) { +int android_tag_socket(int sockfd, uint32_t tag) { return tagSocket(sockfd, tag, -1); } |