commit 3dfa15c49b4c78cdf3bf1af79e9b307596455708
author Nick Kralevich <nnk@google.com> Wed Jan 29 10:03:53 2014 -0800
committer Android Git Automerger <android-git-automerger@android.com> Wed Jan 29 10:03:53 2014 -0800
tree 8277e7ff87dea2de41827ab70df2544737fb52b0
parent 2d35ba4d4a43036706638ca0e96e5e1a9904d2af
parent db3278ab429860161e5baa26f141de95a48de0cb

am db3278ab: Merge "Map SELinux log levels to Android log levels."

* commit 'db3278ab429860161e5baa26f141de95a48de0cb':
  Map SELinux log levels to Android log levels.

core/jni/android_os_SELinux.cpp

diff --git a/core/jni/android_os_SELinux.cpp b/core/jni/android_os_SELinux.cpp
index ca278cf..2b85fef 100644
--- a/core/jni/android_os_SELinux.cpp
+++ b/core/jni/android_os_SELinux.cpp
@@ -443,8 +443,21 @@
 
 static int log_callback(int type, const char *fmt, ...) {
     va_list ap;
+    int priority;
+
+    switch (type) {
+    case SELINUX_WARNING:
+        priority = ANDROID_LOG_WARN;
+        break;
+    case SELINUX_INFO:
+        priority = ANDROID_LOG_INFO;
+        break;
+    default:
+        priority = ANDROID_LOG_ERROR;
+        break;
+    }
     va_start(ap, fmt);
-    LOG_PRI_VA(ANDROID_LOG_ERROR, "SELinux", fmt, ap);
+    LOG_PRI_VA(priority, "SELinux", fmt, ap);
     va_end(ap);
     return 0;
 }