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

Merge "Remove dead code."

Browse Source
This commit is contained in:
Nick Kralevich
2013-01-30 17:57:44 +00:00
committed by Android (Google) Code Review
parent de3c608864 40779e50f0
commit 4ec799d4c6
2 changed files with 0 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/java/com/android/internal/os/ZygoteInit.java
View File

@@ -733,17 +733,6 @@ public class ZygoteInit {
static native long capgetPermitted(int pid) static native long capgetPermitted(int pid)
throws IOException; throws IOException;
/**
* Sets the permitted and effective capability sets of this process.
*
* @param permittedCapabilities permitted set
* @param effectiveCapabilities effective set
* @throws IOException on error
*/
static native void setCapabilities(
long permittedCapabilities,
long effectiveCapabilities) throws IOException;
/** /**
* Invokes select() on the provider array of file descriptors (selecting * Invokes select() on the provider array of file descriptors (selecting
* for readability only). Array elements of null are ignored. * for readability only). Array elements of null are ignored.

28
core/jni/com_android_internal_os_ZygoteInit.cpp
View File

@@ -163,32 +163,6 @@ static void com_android_internal_os_ZygoteInit_setCloseOnExec (JNIEnv *env,
} }
} }
static void com_android_internal_os_ZygoteInit_setCapabilities (JNIEnv *env,
jobject clazz, jlong permitted, jlong effective)
{
struct __user_cap_header_struct capheader;
struct __user_cap_data_struct capdata;
int err;
memset (&capheader, 0, sizeof(capheader));
memset (&capdata, 0, sizeof(capdata));
capheader.version = _LINUX_CAPABILITY_VERSION;
capheader.pid = 0;
// As of this writing, capdata is __u32, but that's expected
// to change...
capdata.effective = effective;
capdata.permitted = permitted;
err = capset (&capheader, &capdata);
if (err < 0) {
jniThrowIOException(env, errno);
return;
}
}
static jlong com_android_internal_os_ZygoteInit_capgetPermitted (JNIEnv *env, static jlong com_android_internal_os_ZygoteInit_capgetPermitted (JNIEnv *env,
jobject clazz, jint pid) jobject clazz, jint pid)
{ {
@@ -304,8 +278,6 @@ static JNINativeMethod gMethods[] = {
(void *) com_android_internal_os_ZygoteInit_reopenStdio}, (void *) com_android_internal_os_ZygoteInit_reopenStdio},
{ "setCloseOnExec", "(Ljava/io/FileDescriptor;Z)V", { "setCloseOnExec", "(Ljava/io/FileDescriptor;Z)V",
(void *) com_android_internal_os_ZygoteInit_setCloseOnExec}, (void *) com_android_internal_os_ZygoteInit_setCloseOnExec},
{ "setCapabilities", "(JJ)V",
(void *) com_android_internal_os_ZygoteInit_setCapabilities },
{ "capgetPermitted", "(I)J", { "capgetPermitted", "(I)J",
(void *) com_android_internal_os_ZygoteInit_capgetPermitted }, (void *) com_android_internal_os_ZygoteInit_capgetPermitted },
{ "selectReadable", "([Ljava/io/FileDescriptor;)I", { "selectReadable", "([Ljava/io/FileDescriptor;)I",