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

Merge "Fix start-time setreuid complaints." into honeycomb

Browse Source
This commit is contained in:
Andy McFadden
2011-01-10 12:07:03 -08:00
committed by Android (Google) Code Review
parent b736cb28ab 05554a4ee9
commit 155b552b1d
1 changed files with 12 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
core/jni/com_android_internal_os_ZygoteInit.cpp
View File

@@ -45,15 +45,11 @@ namespace android {
static jint com_android_internal_os_ZygoteInit_setreuid( static jint com_android_internal_os_ZygoteInit_setreuid(
JNIEnv* env, jobject clazz, jint ruid, jint euid) JNIEnv* env, jobject clazz, jint ruid, jint euid)
{ {
int err; if (setreuid(ruid, euid) < 0) {
errno = 0;
err = setreuid(ruid, euid);
//LOGI("setreuid(%d,%d) err %d errno %d", ruid, euid, err, errno);
return errno; return errno;
} }
return 0;
}
/* /*
* In class com.android.internal.os.ZygoteInit: * In class com.android.internal.os.ZygoteInit:
@@ -62,15 +58,11 @@ static jint com_android_internal_os_ZygoteInit_setreuid(
static jint com_android_internal_os_ZygoteInit_setregid( static jint com_android_internal_os_ZygoteInit_setregid(
JNIEnv* env, jobject clazz, jint rgid, jint egid) JNIEnv* env, jobject clazz, jint rgid, jint egid)
{ {
int err; if (setregid(rgid, egid) < 0) {
errno = 0;
err = setregid(rgid, egid);
//LOGI("setregid(%d,%d) err %d errno %d", rgid, egid, err, errno);
return errno; return errno;
} }
return 0;
}
/* /*
* In class com.android.internal.os.ZygoteInit: * In class com.android.internal.os.ZygoteInit:
@@ -79,14 +71,11 @@ static jint com_android_internal_os_ZygoteInit_setregid(
static jint com_android_internal_os_ZygoteInit_setpgid( static jint com_android_internal_os_ZygoteInit_setpgid(
JNIEnv* env, jobject clazz, jint pid, jint pgid) JNIEnv* env, jobject clazz, jint pid, jint pgid)
{ {
int err; if (setpgid(pid, pgid) < 0) {
errno = 0;
err = setpgid(pid, pgid);
return errno; return errno;
} }
return 0;
}
/* /*
* In class com.android.internal.os.ZygoteInit: * In class com.android.internal.os.ZygoteInit: