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

Commit 71f2cf11 authored by Steve Block's avatar Steve Block
Browse files

Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF) DO NOT MERGE 

See https://android-git.corp.google.com/g/#/c/143865

Bug: 5449033
Change-Id: I0122812ed6ff6f5b59fe4a43ab8bff0577adde0a
parent 1da79501

cmds/app_process/app_main.cpp

+2 −2
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ public: 
    virtual void onStarted()

    {

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

        LOGV("App process: starting thread pool.\n");

        ALOGV("App process: starting thread pool.\n");

        proc->startThreadPool();



        AndroidRuntime* ar = AndroidRuntime::getRuntime();
@@ -94,7 +94,7 @@ public: 
    virtual void onZygoteInit()

    {

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

        LOGV("App process: starting thread pool.\n");

        ALOGV("App process: starting thread pool.\n");

        proc->startThreadPool();

    }

cmds/installd/commands.c

+10 −10
Original line number Diff line number Diff line
@@ -237,7 +237,7 @@ int move_dex(const char *src, const char *dst) 
    if (create_cache_path(src_dex, src)) return -1;

    if (create_cache_path(dst_dex, dst)) return -1;



    LOGV("move %s -> %s\n", src_dex, dst_dex);

    ALOGV("move %s -> %s\n", src_dex, dst_dex);

    if (rename(src_dex, dst_dex) < 0) {

        LOGE("Couldn't move %s: %s\n", src_dex, strerror(errno));

        return -1;
@@ -253,7 +253,7 @@ int rm_dex(const char *path) 
    if (validate_apk_path(path)) return -1;

    if (create_cache_path(dex_path, path)) return -1;



    LOGV("unlink %s\n", dex_path);

    ALOGV("unlink %s\n", dex_path);

    if (unlink(dex_path) < 0) {

        LOGE("Couldn't unlink %s: %s\n", dex_path, strerror(errno));

        return -1;
@@ -463,7 +463,7 @@ static int wait_dexopt(pid_t pid, const char* apk_path) 
    }



    if (WIFEXITED(status) && WEXITSTATUS(status) == 0) {

        LOGV("DexInv: --- END '%s' (success) ---\n", apk_path);

        ALOGV("DexInv: --- END '%s' (success) ---\n", apk_path);

        return 0;

    } else {

        LOGW("DexInv: --- END '%s' --- status=0x%04x, process failed\n",
@@ -530,7 +530,7 @@ int dexopt(const char *apk_path, uid_t uid, int is_public) 
        goto fail;

    }



    LOGV("DexInv: --- BEGIN '%s' ---\n", apk_path);

    ALOGV("DexInv: --- BEGIN '%s' ---\n", apk_path);



    pid_t pid;

    pid = fork();
@@ -598,7 +598,7 @@ void mkinnerdirs(char* path, int basepos, mode_t mode, int uid, int gid, 
        if (path[basepos] == '/') {

            path[basepos] = 0;

            if (lstat(path, statbuf) < 0) {

                LOGV("Making directory: %s\n", path);

                ALOGV("Making directory: %s\n", path);

                if (mkdir(path, mode) == 0) {

                    chown(path, uid, gid);

                } else {
@@ -630,7 +630,7 @@ int movefileordir(char* srcpath, char* dstpath, int dstbasepos, 
    if ((statbuf->st_mode&S_IFDIR) == 0) {

        mkinnerdirs(dstpath, dstbasepos, S_IRWXU|S_IRWXG|S_IXOTH,

                dstuid, dstgid, statbuf);

        LOGV("Renaming %s to %s (uid %d)\n", srcpath, dstpath, dstuid);

        ALOGV("Renaming %s to %s (uid %d)\n", srcpath, dstpath, dstuid);

        if (rename(srcpath, dstpath) >= 0) {

            if (chown(dstpath, dstuid, dstgid) < 0) {

                LOGE("cannot chown %s: %s\n", dstpath, strerror(errno));
@@ -739,7 +739,7 @@ int movefiles() 
                }

                if (bufi < bufe) {

                    buf[bufi] = 0;

                    LOGV("Processing line: %s\n", buf+bufp);

                    ALOGV("Processing line: %s\n", buf+bufp);

                    hasspace = 0;

                    while (bufp < bufi && isspace(buf[bufp])) {

                        hasspace = 1;
@@ -754,7 +754,7 @@ int movefiles() 
                        } else if (srcpkg[0] == 0) {

                            // Skip -- source package no longer exists.

                        } else {

                            LOGV("Move file: %s (from %s to %s)\n", buf+bufp, srcpkg, dstpkg);

                            ALOGV("Move file: %s (from %s to %s)\n", buf+bufp, srcpkg, dstpkg);

                            if (!create_move_path(srcpath, srcpkg, buf+bufp, 0) &&

                                    !create_move_path(dstpath, dstpkg, buf+bufp, 0)) {

                                movefileordir(srcpath, dstpath,
@@ -813,7 +813,7 @@ int movefiles() 
                                                div, UPDATE_COMMANDS_DIR_PREFIX, name);

                                    }

                                }

                                LOGV("Transfering from %s to %s: uid=%d\n",

                                ALOGV("Transfering from %s to %s: uid=%d\n",

                                    srcpkg, dstpkg, dstuid);

                            }

                        }
@@ -840,7 +840,7 @@ int movefiles() 
                    }

                    bufe += readlen;

                    buf[bufe] = 0;

                    LOGV("Read buf: %s\n", buf);

                    ALOGV("Read buf: %s\n", buf);

                }

            }

            close(subfd);

cmds/stagefright/sf2.cpp

+1 −1
Original line number Diff line number Diff line
@@ -500,7 +500,7 @@ private: 
                break;  // Don't coalesce

            }



            LOGV("coalesced %d input buffers", n);

            ALOGV("coalesced %d input buffers", n);



            if (outBuffer->size() == 0) {

                CHECK_NE(mFinalResult, (status_t)OK);

cmds/stagefright/stream.cpp

+1 −1
Original line number Diff line number Diff line
@@ -308,7 +308,7 @@ int main(int argc, char **argv) { 
    ssize_t displayWidth = composerClient->getDisplayWidth(0);

    ssize_t displayHeight = composerClient->getDisplayHeight(0);



    LOGV("display is %d x %d\n", displayWidth, displayHeight);

    ALOGV("display is %d x %d\n", displayWidth, displayHeight);



    sp<SurfaceControl> control =

        composerClient->createSurface(

core/jni/AndroidRuntime.cpp

+3 −3
Original line number Diff line number Diff line
@@ -707,7 +707,7 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv) 
        opt.optionString = enableAssertBuf;

        mOptions.add(opt);

    } else {

        LOGV("Assertions disabled\n");

        ALOGV("Assertions disabled\n");

    }



    if (jniOptsBuf[10] != '\0') {
@@ -896,7 +896,7 @@ void AndroidRuntime::start(const char* className, const char* options) 


void AndroidRuntime::onExit(int code)

{

    LOGV("AndroidRuntime onExit calling exit(%d)", code);

    ALOGV("AndroidRuntime onExit calling exit(%d)", code);

    exit(code);

}
@@ -1215,7 +1215,7 @@ static const RegJNIRec gRegJNI[] = { 
     */

    androidSetCreateThreadFunc((android_create_thread_fn) javaCreateThreadEtc);



    LOGV("--- registering native functions ---\n");

    ALOGV("--- registering native functions ---\n");



    /*

     * Every "register" function calls one or more things that return