summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Maciej Zenczykowski <maze@google.com> 2019-06-26 06:38:45 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2019-06-26 06:38:45 +0000
commit314765c5948142e5b275a3f78560228f0eb05dd5 (patch)
tree07084ec2b6f1354035dbf14f3b7aec96e1d8d1b0
parentf8b534a834af00633add38cabb73e54ec0cdf282 (diff)
parenta01d7b090b5837927e0298a0c286ce33b40c30de (diff)
Merge "BT: Add CAP_NET_ADMIN for Bluetooth Process" into qt-dev
-rw-r--r--core/jni/com_android_internal_os_Zygote.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/core/jni/com_android_internal_os_Zygote.cpp b/core/jni/com_android_internal_os_Zygote.cpp
index 4783a257755f..82c27f02ba87 100644
--- a/core/jni/com_android_internal_os_Zygote.cpp
+++ b/core/jni/com_android_internal_os_Zygote.cpp
@@ -1160,6 +1160,7 @@ static jlong CalculateCapabilities(JNIEnv* env, jint uid, jint gid, jintArray gi
/*
* Grant the following capabilities to the Bluetooth user:
* - CAP_WAKE_ALARM
+ * - CAP_NET_ADMIN
* - CAP_NET_RAW
* - CAP_NET_BIND_SERVICE (for DHCP client functionality)
* - CAP_SYS_NICE (for setting RT priority for audio-related threads)
@@ -1167,6 +1168,7 @@ static jlong CalculateCapabilities(JNIEnv* env, jint uid, jint gid, jintArray gi
if (multiuser_get_app_id(uid) == AID_BLUETOOTH) {
capabilities |= (1LL << CAP_WAKE_ALARM);
+ capabilities |= (1LL << CAP_NET_ADMIN);
capabilities |= (1LL << CAP_NET_RAW);
capabilities |= (1LL << CAP_NET_BIND_SERVICE);
capabilities |= (1LL << CAP_SYS_NICE);