resolve merge conflicts of b242549166 to nyc-dev

am: 0f6ae2ec0d

* commit '0f6ae2ec0df270c4ce51c87896fe01fe6e1fedfa':
  Give bluetooth sufficient capabilities to run DhcpClient
This commit is contained in:
Erik Kline
2016-02-22 07:16:01 +00:00
committed by android-build-merger

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"