Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1fe97244 authored by Ken Chen's avatar Ken Chen Committed by Automerger Merge Worker
Browse files

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

Merge "Update data type and comments on tagSocket/untagSocket APIs" am: ef89731c am: aa82affb am: 292d5f01 am: 72d6df3c

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



Change-Id: I809cb95eaa0b1c30d4a97c46beb6e1fd5241db71
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4ba7df36 72d6df3c

native/android/libandroid_net.map.txt

+4 −4
Original line number Diff line number Diff line
@@ -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

native/android/net.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

}