Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "frameworks/base: fix errors inside ALOGV"

Browse Source
This commit is contained in:
Colin Cross
2014-02-10 22:02:50 +00:00
committed by Gerrit Code Review
parent 56062983f1 d06969518b
commit 40545f32d3
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/jni/android_database_SQLiteGlobal.cpp
View File

@@ -39,7 +39,7 @@ static void sqliteLogCallback(void* data, int iErrCode, const char* zMsg) {
bool verboseLog = !!data; bool verboseLog = !!data;
if (iErrCode == 0 || iErrCode == SQLITE_CONSTRAINT || iErrCode == SQLITE_SCHEMA) { if (iErrCode == 0 || iErrCode == SQLITE_CONSTRAINT || iErrCode == SQLITE_SCHEMA) {
if (verboseLog) { 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 { } else {
ALOG(LOG_ERROR, SQLITE_LOG_TAG, "(%d) %s\n", iErrCode, zMsg); ALOG(LOG_ERROR, SQLITE_LOG_TAG, "(%d) %s\n", iErrCode, zMsg);

2
core/jni/android_os_SELinux.cpp
View File

@@ -411,7 +411,7 @@ static jboolean native_restorecon(JNIEnv *env, jobject, jstring pathnameStr) {
ScopedUtfChars pathname(env, pathnameStr); ScopedUtfChars pathname(env, pathnameStr);
if (pathname.c_str() == NULL) { if (pathname.c_str() == NULL) {
ALOGV("restorecon(%p) => threw exception", pathname); ALOGV("restorecon(%p) => threw exception", pathnameStr);
return false; return false;
} }