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

am 16db4101: Merge "DO NOT MERGE Add \'bluetooth\' user to the \'system\' group." into cw-e-dev

Browse Source 
* commit '16db4101829c7beee42a09fcaf87fa4e31bc1d5a':
  DO NOT MERGE Add 'bluetooth' user to the 'system' group.
This commit is contained in:
Sharvil Nanavati
2015-09-03 21:12:33 +00:00
committed by Android Git Automerger
parent 6bd2f87ee4 16db410182
commit 80770c0991
1 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
core/jni/com_android_internal_os_Zygote.cpp
View File

@@ -611,10 +611,34 @@ static jint com_android_internal_os_Zygote_nativeForkAndSpecialize(
jint debug_flags, jobjectArray rlimits, jint debug_flags, jobjectArray rlimits,
jint mount_external, jstring se_info, jstring se_name, jint mount_external, jstring se_info, jstring se_name,
jintArray fdsToClose, jstring instructionSet, jstring appDataDir) { jintArray fdsToClose, jstring instructionSet, jstring appDataDir) {
// Grant CAP_WAKE_ALARM to the Bluetooth process.
jlong capabilities = 0; jlong capabilities = 0;
if (uid == AID_BLUETOOTH) { if (uid == AID_BLUETOOTH) {
// Grant CAP_WAKE_ALARM and CAP_BLOCK_SUSPEND to the Bluetooth process.
capabilities |= (1LL << CAP_WAKE_ALARM); capabilities |= (1LL << CAP_WAKE_ALARM);
capabilities |= (1LL << CAP_BLOCK_SUSPEND);
// Add the Bluetooth process to the system group.
jsize length = env->GetArrayLength(reinterpret_cast<jarray>(gids));
jintArray gids_with_system = env->NewIntArray(length + 1);
if (!gids_with_system) {
ALOGE("could not allocate java array for gids");
RuntimeAbort(env);
}
jint *gids_elements = env->GetIntArrayElements(gids, NULL);
jint *gids_with_system_elements = env->GetIntArrayElements(gids_with_system, NULL);
if (!gids_elements || !gids_with_system_elements) {
ALOGE("could not allocate arrays for gids");
RuntimeAbort(env);
}
gids_with_system_elements[0] = AID_SYSTEM;
memcpy(&gids_with_system_elements[1], &gids_elements[0], length * sizeof(jint));
env->ReleaseIntArrayElements(gids, gids_elements, JNI_ABORT);
env->ReleaseIntArrayElements(gids_with_system, gids_with_system_elements, 0);
gids = gids_with_system;
} }
return ForkAndSpecializeCommon(env, uid, gid, gids, debug_flags, return ForkAndSpecializeCommon(env, uid, gid, gids, debug_flags,