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

Commit c318bbb0 authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by android code review
Browse files

Merge "Rename (IF_)LOG() to (IF_)ALOG()"

parents b4cee0f8 ad3f5145

core/jni/android/graphics/TextLayout.cpp

+3 −3
Original line number Original line Diff line number Diff line
@@ -78,7 +78,7 @@ int TextLayout::shapeRtlText(const jchar* context, jsize start, jsize count, jsi 
            }

            }

        }

        }

        count = end;

        count = end;

        // LOG(LOG_INFO, "CSRTL", "start %d count %d ccount %d\n", start, count, contextCount);

        // ALOG(LOG_INFO, "CSRTL", "start %d count %d ccount %d\n", start, count, contextCount);

        ubidi_writeReverse(buffer, count, shaped, count, UBIDI_DO_MIRRORING | UBIDI_OUTPUT_REVERSE

        ubidi_writeReverse(buffer, count, shaped, count, UBIDI_DO_MIRRORING | UBIDI_OUTPUT_REVERSE

                           | UBIDI_KEEP_BASE_COMBINING, &status);

                           | UBIDI_KEEP_BASE_COMBINING, &status);

        if (U_SUCCESS(status)) {

        if (U_SUCCESS(status)) {
@@ -125,7 +125,7 @@ jint TextLayout::layoutLine(const jchar* text, jint len, jint flags, int& dir, j 




            int rc = ubidi_countRuns(bidi, &status);

            int rc = ubidi_countRuns(bidi, &status);

            if (U_SUCCESS(status)) {

            if (U_SUCCESS(status)) {

                // LOG(LOG_INFO, "LAYOUT", "para bidiReq=%d dir=%d rc=%d\n", bidiReq, dir, rc);

                // ALOG(LOG_INFO, "LAYOUT", "para bidiReq=%d dir=%d rc=%d\n", bidiReq, dir, rc);





                int32_t slen = 0;

                int32_t slen = 0;

                for (int i = 0; i < rc; ++i) {

                for (int i = 0; i < rc; ++i) {
@@ -164,7 +164,7 @@ bool TextLayout::prepareText(SkPaint* paint, const jchar* text, jsize len, jint 
        UErrorCode status = U_ZERO_ERROR;

        UErrorCode status = U_ZERO_ERROR;

        len = layoutLine(text, len, bidiFlags, dir, buffer, status); // might change len, dir

        len = layoutLine(text, len, bidiFlags, dir, buffer, status); // might change len, dir

        if (!U_SUCCESS(status)) {

        if (!U_SUCCESS(status)) {

            LOG(LOG_WARN, "LAYOUT", "drawText error %d\n", status);

            ALOG(LOG_WARN, "LAYOUT", "drawText error %d\n", status);

            free(buffer);

            free(buffer);

            return false; // can't render

            return false; // can't render

        }

        }

core/jni/android_app_NativeActivity.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -36,7 +36,7 @@ 
#include "android_view_KeyEvent.h"

#include "android_view_KeyEvent.h"





#define LOG_TRACE(...)

#define LOG_TRACE(...)

//#define LOG_TRACE(...) LOG(LOG_DEBUG, LOG_TAG, __VA_ARGS__)

//#define LOG_TRACE(...) ALOG(LOG_DEBUG, LOG_TAG, __VA_ARGS__)





namespace android

namespace android

{

{

core/jni/android_bluetooth_HeadsetBase.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -494,7 +494,7 @@ static void pretty_log_urc(const char *urc) { 
            }

            }

        }

        }

    }

    }

    IF_LOGV() LOG(LOG_VERBOSE, "Bluetooth AT sent", "%s", buf);

    IF_LOGV() ALOG(LOG_VERBOSE, "Bluetooth AT sent", "%s", buf);





    free(buf);

    free(buf);

}

}

core/jni/android_nfc.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -28,7 +28,7 @@ 
extern "C" {

extern "C" {





#if 0

#if 0

  #define TRACE(...) LOG(LOG_DEBUG, "NdefMessage", __VA_ARGS__)

  #define TRACE(...) ALOG(LOG_DEBUG, "NdefMessage", __VA_ARGS__)

#else

#else

  #define TRACE(...)

  #define TRACE(...)

#endif

#endif

include/binder/CursorWindow.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -31,8 +31,8 @@ 




#else

#else





#define IF_LOG_WINDOW() IF_LOG(LOG_DEBUG, "CursorWindow")

#define IF_LOG_WINDOW() IF_ALOG(LOG_DEBUG, "CursorWindow")

#define LOG_WINDOW(...) LOG(LOG_DEBUG, "CursorWindow", __VA_ARGS__)

#define LOG_WINDOW(...) ALOG(LOG_DEBUG, "CursorWindow", __VA_ARGS__)





#endif

#endif