am d7baaed8: Merge "Allow AOSP to boot."

* commit 'd7baaed89e498ad3cf7d9c487d6cae967e562ea4': Allow AOSP to boot.
2014-09-25 19:00:34 +00:00
parent dfdabe3728 d7baaed89e
commit c20a4bd1a4
1 changed files with 0 additions and 3 deletions
--- a/core/jni/android_util_Process.cpp
+++ b/core/jni/android_util_Process.cpp
@@ -348,7 +348,6 @@ jint android_os_Process_getThreadPriority(JNIEnv* env, jobject clazz,
 jboolean android_os_Process_setOomAdj(JNIEnv* env, jobject clazz,
                                      jint pid, jint adj)
 {
-#ifdef HAVE_OOM_ADJ
    char text[64];
    sprintf(text, "/proc/%d/oom_adj", pid);
    int fd = open(text, O_WRONLY);
@@ -358,8 +357,6 @@ jboolean android_os_Process_setOomAdj(JNIEnv* env, jobject clazz,
        close(fd);
    }
    return true;
-#endif
-    return false;
 }

 jboolean android_os_Process_setSwappiness(JNIEnv *env, jobject clazz,