Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolve merge conflicts of b242549166 to nyc-dev

Browse Source 
Change-Id: I42d4cac95a209fdfae5769d75d90f004a94d60a4
This commit is contained in:
Erik Kline
2016-02-22 15:42:07 +09:00
parent 13daed9fea b242549166
commit 0f6ae2ec0d
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/jni/com_android_internal_os_Zygote.cpp
View File

@@ -608,8 +608,12 @@ static jint com_android_internal_os_Zygote_nativeForkAndSpecialize(
jlong capabilities = 0;
// Grant CAP_WAKE_ALARM to the Bluetooth process.
// Additionally, allow bluetooth to open packet sockets so it can start the DHCP client.
// TODO: consider making such functionality an RPC to netd.
if (multiuser_get_app_id(uid) == AID_BLUETOOTH) {
capabilities |= (1LL << CAP_WAKE_ALARM);
capabilities |= (1LL << CAP_NET_RAW);
capabilities |= (1LL << CAP_NET_BIND_SERVICE);
}
// Grant CAP_BLOCK_SUSPEND to processes that belong to GID "wakelock"