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

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

Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)"

parents ba7f0d2a 933e8561

cmds/bootanimation/bootanimation_main.cpp

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ int main(int argc, char** argv) 
    char value[PROPERTY_VALUE_MAX];

    property_get("debug.sf.nobootanimation", value, "0");

    int noBootAnimation = atoi(value);

    LOGI_IF(noBootAnimation,  "boot animation disabled");

    ALOGI_IF(noBootAnimation,  "boot animation disabled");

    if (!noBootAnimation) {



        sp<ProcessState> proc(ProcessState::self());

cmds/dumpstate/dumpstate.c

+4 −4
Original line number Diff line number Diff line
@@ -84,9 +84,9 @@ static void dumpstate() { 
    dump_file("BUDDYINFO", "/proc/buddyinfo");



    if (screenshot_path[0]) {

        LOGI("taking screenshot\n");

        ALOGI("taking screenshot\n");

        run_command(NULL, 5, "su", "root", "screenshot", screenshot_path, NULL);

        LOGI("wrote screenshot: %s\n", screenshot_path);

        ALOGI("wrote screenshot: %s\n", screenshot_path);

    }



    run_command("SYSTEM LOG", 20, "logcat", "-v", "threadtime", "-d", "*:v", NULL);
@@ -271,7 +271,7 @@ int main(int argc, char *argv[]) { 
    int use_socket = 0;

    int do_fb = 0;



    LOGI("begin\n");

    ALOGI("begin\n");



    /* set as high priority, and protect from OOM killer */

    setpriority(PRIO_PROCESS, 0, -20);
@@ -386,7 +386,7 @@ int main(int argc, char *argv[]) { 
        fprintf(stderr, "rename(%s, %s): %s\n", tmp_path, path, strerror(errno));

    }



    LOGI("done\n");

    ALOGI("done\n");



    return 0;

}

cmds/installd/commands.c

+1 −1
Original line number Diff line number Diff line
@@ -189,7 +189,7 @@ int free_cache(int64_t free_size) 
    avail = disk_free();

    if (avail < 0) return -1;



    LOGI("free_cache(%" PRId64 ") avail %" PRId64 "\n", free_size, avail);

    ALOGI("free_cache(%" PRId64 ") avail %" PRId64 "\n", free_size, avail);

    if (avail >= free_size) return 0;



    if (create_persona_path(datadir, 0)) {

cmds/installd/installd.c

+4 −4
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ static int execute(int s, char cmd[BUFFER_MAX]) 
    unsigned short count;

    int ret = -1;



//    LOGI("execute('%s')\n", cmd);

//    ALOGI("execute('%s')\n", cmd);



        /* default reply is "" */

    reply[0] = 0;
@@ -242,7 +242,7 @@ done: 
    if (n > BUFFER_MAX) n = BUFFER_MAX;

    count = n;



//    LOGI("reply: '%s'\n", cmd);

//    ALOGI("reply: '%s'\n", cmd);

    if (writex(s, &count, sizeof(count))) return -1;

    if (writex(s, cmd, count)) return -1;

    return 0;
@@ -380,7 +380,7 @@ int main(const int argc, const char *argv[]) { 
        }

        fcntl(s, F_SETFD, FD_CLOEXEC);



        LOGI("new connection\n");

        ALOGI("new connection\n");

        for (;;) {

            unsigned short count;

            if (readx(s, &count, sizeof(count))) {
@@ -398,7 +398,7 @@ int main(const int argc, const char *argv[]) { 
            buf[count] = 0;

            if (execute(s, buf)) break;

        }

        LOGI("closing connection\n");

        ALOGI("closing connection\n");

        close(s);

    }

cmds/keystore/keystore.cpp

+1 −1
Original line number Diff line number Diff line
@@ -796,7 +796,7 @@ int main(int argc, char* argv[]) { 
                } else {

                    send_code(sock, response);

                }

                LOGI("uid: %d action: %c -> %d state: %d -> %d retry: %d",

                ALOGI("uid: %d action: %c -> %d state: %d -> %d retry: %d",

                     cred.uid,

                     request, response,

                     old_state, keyStore.getState(),