Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update data type and comments on tagSocket/untagSocket APIs" am: ef89731cd3

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2049804

Change-Id: Ic958c83026e64072ece9361227bbd0bcfe79f5e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Ken Chen
2022-03-31 03:46:57 +00:00
committed by Automerger Merge Worker
parent f594c2260d ef89731cd3
commit aa82affbc0
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
native/android/libandroid_net.map.txt
View File

@@ -5,20 +5,20 @@
# which might be a few years old. # which might be a few years old.
LIBANDROID_NET { LIBANDROID_NET {
global: 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_getaddrinfofornetwork; # llndk
android_setsocknetwork; # llndk android_setsocknetwork; # llndk
android_setprocnetwork; # 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_cancel; # llndk
android_res_nquery; # llndk android_res_nquery; # llndk
android_res_nresult; # llndk android_res_nresult; # llndk
android_res_nsend; # 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_getprocnetwork; # llndk
android_setprocdns; # llndk android_setprocdns; # llndk
android_getprocdns; # 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_with_uid; # llndk
android_tag_socket; # llndk android_tag_socket; # llndk
android_untag_socket; # llndk android_untag_socket; # llndk

4
native/android/net.c
View File

@@ -162,11 +162,11 @@ void android_res_cancel(int nsend_fd) {
resNetworkCancel(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); 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); return tagSocket(sockfd, tag, -1);
} }