diff options
| author | Colin Cross <ccross@android.com> | 2014-02-10 22:14:53 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-10 22:14:53 +0000 |
| commit | e7755a0d2586b90a75f8358053e5d04952d1f702 (patch) | |
| tree | e90deb011572291f581331e79205c898fac2c464 | |
| parent | 9348ac8249d2ef8d935e98053e5d135a2ff1ebcc (diff) | |
| parent | 675d44ad2355eb4404e286f2c337196297d1e26f (diff) | |
| download | frameworks_base-e7755a0d2586b90a75f8358053e5d04952d1f702.zip frameworks_base-e7755a0d2586b90a75f8358053e5d04952d1f702.tar.gz frameworks_base-e7755a0d2586b90a75f8358053e5d04952d1f702.tar.bz2 | |
am 675d44ad: am 12f1f5b8: am 40545f32: Merge "frameworks/base: fix errors inside ALOGV"
* commit '675d44ad2355eb4404e286f2c337196297d1e26f':
frameworks/base: fix errors inside ALOGV
| -rw-r--r-- | core/jni/android_database_SQLiteGlobal.cpp | 2 | ||||
| -rw-r--r-- | 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 acc2276..89d64fa 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 2b85fef..db84d00 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; } |