diff options
| author | 2024-01-02 11:51:06 +0000 | |
|---|---|---|
| committer | 2024-01-02 11:51:06 +0000 | |
| commit | 1de28ac07f9503789128210fd21801de30720189 (patch) | |
| tree | 14c9a2e681d61c3c994acb9e97c9d7d8c7bcb59c | |
| parent | 08cb916b7ddbefd24a3799ec828147fa58fe51b5 (diff) | |
| parent | 667b7f4d07b8b86fa02d564e9553fa110c9b4dbd (diff) | |
Merge "grant CAP_WAKE_ALARM to AID_NETWORK_STACK" into main am: 0c68cb6ab6 am: 667b7f4d07
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2862649
Change-Id: I0a2102f35547761a84ba1baa1959e9e2223df0af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/jni/com_android_internal_os_Zygote.cpp | 1 |
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 b12e14782361..14943d36ba6a 100644 --- a/core/jni/com_android_internal_os_Zygote.cpp +++ b/core/jni/com_android_internal_os_Zygote.cpp @@ -2056,6 +2056,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); |