diff options
author | Dan Albert <danalbert@google.com> | 2014-09-25 18:50:18 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-09-25 18:50:18 +0000 |
commit | d7baaed89e498ad3cf7d9c487d6cae967e562ea4 (patch) | |
tree | bac7296c422f7e4f628ed5b1ece0637115712701 | |
parent | 6f954cf2eb2baadf26bc0aba6272ef19b5dd45a0 (diff) | |
parent | e08bd64184961607e5d558b43a6437833c221040 (diff) | |
download | base-d7baaed89e498ad3cf7d9c487d6cae967e562ea4.tar.gz |
Merge "Allow AOSP to boot."
-rw-r--r-- | core/jni/android_util_Process.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/core/jni/android_util_Process.cpp b/core/jni/android_util_Process.cpp index fbe7a17362de..7b8ac801daa1 100644 --- 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, |