summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Maciej Żenczykowski <maze@google.com> 2024-01-02 10:53:27 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2024-01-02 10:53:27 +0000
commit0c68cb6ab66a6940cdf7beb80f3a9272561259d1 (patch)
treee1a04ad3a24517838ef05277db87a379b76308fe
parent44a679e5e041b0ba8d4f1a5609da534afe85965c (diff)
parentebc0e20d8b3595a2ad98179835887561531c8252 (diff)
Merge "grant CAP_WAKE_ALARM to AID_NETWORK_STACK" into main
-rw-r--r--core/jni/com_android_internal_os_Zygote.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/jni/com_android_internal_os_Zygote.cpp b/core/jni/com_android_internal_os_Zygote.cpp
index 56066b2d813c..9c40a28dfd81 100644
--- a/core/jni/com_android_internal_os_Zygote.cpp
+++ b/core/jni/com_android_internal_os_Zygote.cpp
@@ -2050,6 +2050,7 @@ static jlong CalculateCapabilities(JNIEnv* env, jint uid, jint gid, jintArray gi
}
if (multiuser_get_app_id(uid) == AID_NETWORK_STACK) {
+ capabilities |= (1LL << CAP_WAKE_ALARM);
capabilities |= (1LL << CAP_NET_ADMIN);
capabilities |= (1LL << CAP_NET_BROADCAST);
capabilities |= (1LL << CAP_NET_BIND_SERVICE);