Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 675d44ad authored by Colin Cross's avatar Colin Cross Committed by Android Git Automerger
Browse files

am 12f1f5b8: am 40545f32: Merge "frameworks/base: fix errors inside ALOGV" 

* commit '12f1f5b8':
  frameworks/base: fix errors inside ALOGV
parents f7193bf8 12f1f5b8

core/jni/android_database_SQLiteGlobal.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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);

core/jni/android_os_SELinux.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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;

    }