summaryrefslogtreecommitdiffstats
path: root/core/jni
diff options
context:
space:
mode:
authorNick Kralevich <nnk@google.com>2013-01-30 09:29:15 -0800
committerNick Kralevich <nnk@google.com>2013-01-30 09:29:15 -0800
commit40779e50f04b0d03b49836c640308061f88ff0be (patch)
tree1ea3ff15c9b54ae6815ed9eec8ec87d8af859be9 /core/jni
parent6fc736971a66eb4b461931a5e972d51b65bfa68f (diff)
downloadframeworks_base-40779e50f04b0d03b49836c640308061f88ff0be.zip
frameworks_base-40779e50f04b0d03b49836c640308061f88ff0be.tar.gz
frameworks_base-40779e50f04b0d03b49836c640308061f88ff0be.tar.bz2
Remove dead code.
Setting capabiltities is handled by dalvik. This code is never called. Change-Id: I903952c43cf60ea59ec954c9168a7604d05ccaf7
Diffstat (limited to 'core/jni')
-rw-r--r--core/jni/com_android_internal_os_ZygoteInit.cpp28
1 files changed, 0 insertions, 28 deletions
diff --git a/core/jni/com_android_internal_os_ZygoteInit.cpp b/core/jni/com_android_internal_os_ZygoteInit.cpp
index 7e5dede..bc8c4a7 100644
--- a/core/jni/com_android_internal_os_ZygoteInit.cpp
+++ b/core/jni/com_android_internal_os_ZygoteInit.cpp
@@ -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,
jobject clazz, jint pid)
{
@@ -304,8 +278,6 @@ static JNINativeMethod gMethods[] = {
(void *) com_android_internal_os_ZygoteInit_reopenStdio},
{ "setCloseOnExec", "(Ljava/io/FileDescriptor;Z)V",
(void *) com_android_internal_os_ZygoteInit_setCloseOnExec},
- { "setCapabilities", "(JJ)V",
- (void *) com_android_internal_os_ZygoteInit_setCapabilities },
{ "capgetPermitted", "(I)J",
(void *) com_android_internal_os_ZygoteInit_capgetPermitted },
{ "selectReadable", "([Ljava/io/FileDescriptor;)I",