summaryrefslogtreecommitdiff
path: root/native
diff options
context:
space:
mode:
Diffstat (limited to 'native')
-rw-r--r--native/android/activity_manager.cpp3
-rw-r--r--native/android/libandroid_net.map.txt8
-rw-r--r--native/android/net.c4
3 files changed, 9 insertions, 6 deletions
diff --git a/native/android/activity_manager.cpp b/native/android/activity_manager.cpp
index 82f4569b871e..155a355241c8 100644
--- a/native/android/activity_manager.cpp
+++ b/native/android/activity_manager.cpp
@@ -45,6 +45,7 @@ struct UidObserver : public BnUidObserver, public virtual IBinder::DeathRecipien
void onUidIdle(uid_t uid, bool disabled) override;
void onUidStateChanged(uid_t uid, int32_t procState, int64_t procStateSeq,
int32_t capability) override;
+ void onUidProcAdjChanged(uid_t uid) override;
// IBinder::DeathRecipient implementation
void binderDied(const wp<IBinder>& who) override;
@@ -120,6 +121,8 @@ void UidObserver::onUidActive(uid_t uid __unused) {}
void UidObserver::onUidIdle(uid_t uid __unused, bool disabled __unused) {}
+void UidObserver::onUidProcAdjChanged(uid_t uid __unused) {}
+
void UidObserver::onUidStateChanged(uid_t uid, int32_t procState,
int64_t procStateSeq __unused,
int32_t capability __unused) {
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);
}