From d06969518b12afb27a487ae66f8d73a4d3116587 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Thu, 6 Feb 2014 20:17:48 -0800 Subject: [PATCH] frameworks/base: fix errors inside ALOGV Fix errors exposed by adding compile-time checking to disabled ALOGVs. Change-Id: I9beeb5d5df498c63d6bed49734ee80a8e0afcefc --- core/jni/android_database_SQLiteGlobal.cpp | 2 +- core/jni/android_os_SELinux.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/jni/android_database_SQLiteGlobal.cpp b/core/jni/android_database_SQLiteGlobal.cpp index acc2276ef9d16..89d64fa59bef8 100644 --- a/core/jni/android_database_SQLiteGlobal.cpp +++ b/core/jni/android_database_SQLiteGlobal.cpp @@ -39,7 +39,7 @@ static void sqliteLogCallback(void* data, int iErrCode, const char* zMsg) { bool verboseLog = !!data; if (iErrCode == 0 || iErrCode == SQLITE_CONSTRAINT || iErrCode == SQLITE_SCHEMA) { if (verboseLog) { - ALOGV(LOG_VERBOSE, SQLITE_LOG_TAG, "(%d) %s\n", iErrCode, zMsg); + ALOG(LOG_VERBOSE, SQLITE_LOG_TAG, "(%d) %s\n", iErrCode, zMsg); } } else { ALOG(LOG_ERROR, SQLITE_LOG_TAG, "(%d) %s\n", iErrCode, zMsg); diff --git a/core/jni/android_os_SELinux.cpp b/core/jni/android_os_SELinux.cpp index 2b85fefbd8e5f..db84d000d17db 100644 --- a/core/jni/android_os_SELinux.cpp +++ b/core/jni/android_os_SELinux.cpp @@ -411,7 +411,7 @@ static jboolean native_restorecon(JNIEnv *env, jobject, jstring pathnameStr) { ScopedUtfChars pathname(env, pathnameStr); if (pathname.c_str() == NULL) { - ALOGV("restorecon(%p) => threw exception", pathname); + ALOGV("restorecon(%p) => threw exception", pathnameStr); return false; }