diff options
| author | Nick Kralevich <nnk@google.com> | 2014-01-31 10:26:32 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-01-31 10:26:32 +0000 |
| commit | 643be3bab19a6305e776721854b293928bf2bfaa (patch) | |
| tree | ecf7769b1c245204910d6a9efcddc522dad05e7d | |
| parent | 53959634b35ab75ef40ac4514d50bae2de9425ac (diff) | |
| parent | 3dfa15c49b4c78cdf3bf1af79e9b307596455708 (diff) | |
| download | frameworks_base-643be3bab19a6305e776721854b293928bf2bfaa.zip frameworks_base-643be3bab19a6305e776721854b293928bf2bfaa.tar.gz frameworks_base-643be3bab19a6305e776721854b293928bf2bfaa.tar.bz2 | |
am 3dfa15c4: am db3278ab: Merge "Map SELinux log levels to Android log levels."
* commit '3dfa15c49b4c78cdf3bf1af79e9b307596455708':
Map SELinux log levels to Android log levels.
| -rw-r--r-- | core/jni/android_os_SELinux.cpp | 15 |
1 files changed, 14 insertions, 1 deletions
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 JNINativeMethod method_table[] = { 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; } |