Merge "BT: Add CAP_NET_ADMIN for Bluetooth Process" am: 867956b55c am: 0208ab3502 am: eb3773e4f7 (511c769f) · Commits · e / os / android_frameworks_base

core/jni/com_android_internal_os_Zygote.cpp

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1200,6 +1200,7 @@ static jlong CalculateCapabilities(JNIEnv* env, jint uid, jint gid, jintArray gi
	/*		/*
	* Grant the following capabilities to the Bluetooth user:		* Grant the following capabilities to the Bluetooth user:
	* - CAP_WAKE_ALARM		* - CAP_WAKE_ALARM
			* - CAP_NET_ADMIN
	* - CAP_NET_RAW		* - CAP_NET_RAW
	* - CAP_NET_BIND_SERVICE (for DHCP client functionality)		* - CAP_NET_BIND_SERVICE (for DHCP client functionality)
	* - CAP_SYS_NICE (for setting RT priority for audio-related threads)		* - CAP_SYS_NICE (for setting RT priority for audio-related threads)
	@@ -1207,6 +1208,7 @@ static jlong CalculateCapabilities(JNIEnv* env, jint uid, jint gid, jintArray gi

	if (multiuser_get_app_id(uid) == AID_BLUETOOTH) {		if (multiuser_get_app_id(uid) == AID_BLUETOOTH) {
	capabilities \|= (1LL << CAP_WAKE_ALARM);		capabilities \|= (1LL << CAP_WAKE_ALARM);
			capabilities \|= (1LL << CAP_NET_ADMIN);
	capabilities \|= (1LL << CAP_NET_RAW);		capabilities \|= (1LL << CAP_NET_RAW);
	capabilities \|= (1LL << CAP_NET_BIND_SERVICE);		capabilities \|= (1LL << CAP_NET_BIND_SERVICE);
	capabilities \|= (1LL << CAP_SYS_NICE);		capabilities \|= (1LL << CAP_SYS_NICE);