Merge "Allow AOSP to boot."

This commit is contained in:
Dan Albert
2014-09-25 18:50:18 +00:00
committed by Gerrit Code Review

View File

@@ -348,7 +348,6 @@ jint android_os_Process_getThreadPriority(JNIEnv* env, jobject clazz,
jboolean android_os_Process_setOomAdj(JNIEnv* env, jobject clazz, jboolean android_os_Process_setOomAdj(JNIEnv* env, jobject clazz,
jint pid, jint adj) jint pid, jint adj)
{ {
#ifdef HAVE_OOM_ADJ
char text[64]; char text[64];
sprintf(text, "/proc/%d/oom_adj", pid); sprintf(text, "/proc/%d/oom_adj", pid);
int fd = open(text, O_WRONLY); int fd = open(text, O_WRONLY);
@@ -358,8 +357,6 @@ jboolean android_os_Process_setOomAdj(JNIEnv* env, jobject clazz,
close(fd); close(fd);
} }
return true; return true;
#endif
return false;
} }
jboolean android_os_Process_setSwappiness(JNIEnv *env, jobject clazz, jboolean android_os_Process_setSwappiness(JNIEnv *env, jobject clazz,