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

Commit d3ed2f2e authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by Android Git Automerger
Browse files

am 08d3c6e5: am 4f367f33: Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)" 

* commit '08d3c6e5ba5c3e5fcc386b07efa709325d45b9ff':
  Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)
parents 9cb49d58 381857ed

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(),

include/utils/ResourceTypes.h

+5 −5
Original line number Diff line number Diff line
@@ -1277,7 +1277,7 @@ struct ResTable_config 
                    myDelta += requested->screenHeightDp - screenHeightDp;

                    otherDelta += requested->screenHeightDp - o.screenHeightDp;

                }

                //LOGI("Comparing this %dx%d to other %dx%d in %dx%d: myDelta=%d otherDelta=%d",

                //ALOGI("Comparing this %dx%d to other %dx%d in %dx%d: myDelta=%d otherDelta=%d",

                //    screenWidthDp, screenHeightDp, o.screenWidthDp, o.screenHeightDp,

                //    requested->screenWidthDp, requested->screenHeightDp, myDelta, otherDelta);

                return (myDelta <= otherDelta);
@@ -1506,11 +1506,11 @@ struct ResTable_config 
        }

        if (screenSizeDp != 0) {

            if (screenWidthDp != 0 && screenWidthDp > settings.screenWidthDp) {

                //LOGI("Filtering out width %d in requested %d", screenWidthDp, settings.screenWidthDp);

                //ALOGI("Filtering out width %d in requested %d", screenWidthDp, settings.screenWidthDp);

                return false;

            }

            if (screenHeightDp != 0 && screenHeightDp > settings.screenHeightDp) {

                //LOGI("Filtering out height %d in requested %d", screenHeightDp, settings.screenHeightDp);

                //ALOGI("Filtering out height %d in requested %d", screenHeightDp, settings.screenHeightDp);

                return false;

            }

        }
@@ -1530,9 +1530,9 @@ struct ResTable_config 
                // For compatibility, we count a request for KEYSHIDDEN_NO as also

                // matching the more recent KEYSHIDDEN_SOFT.  Basically

                // KEYSHIDDEN_NO means there is some kind of keyboard available.

                //LOGI("Matching keysHidden: have=%d, config=%d\n", keysHidden, setKeysHidden);

                //ALOGI("Matching keysHidden: have=%d, config=%d\n", keysHidden, setKeysHidden);

                if (keysHidden != KEYSHIDDEN_NO || setKeysHidden != KEYSHIDDEN_SOFT) {

                    //LOGI("No match!");

                    //ALOGI("No match!");

                    return false;

                }

            }

libs/binder/IPCThreadState.cpp

+8 −8
Original line number Diff line number Diff line
@@ -493,7 +493,7 @@ void IPCThreadState::joinThreadPool(bool isMain) 


void IPCThreadState::stopProcess(bool immediate)

{

    //LOGI("**** STOPPING PROCESS");

    //ALOGI("**** STOPPING PROCESS");

    flushCommands();

    int fd = mProcess->mDriverFD;

    mProcess->mDriverFD = -1;
@@ -530,9 +530,9 @@ status_t IPCThreadState::transact(int32_t handle, 
    if ((flags & TF_ONE_WAY) == 0) {

        #if 0

        if (code == 4) { // relayout

            LOGI(">>>>>> CALLING transaction 4");

            ALOGI(">>>>>> CALLING transaction 4");

        } else {

            LOGI(">>>>>> CALLING transaction %d", code);

            ALOGI(">>>>>> CALLING transaction %d", code);

        }

        #endif

        if (reply) {
@@ -543,9 +543,9 @@ status_t IPCThreadState::transact(int32_t handle, 
        }

        #if 0

        if (code == 4) { // relayout

            LOGI("<<<<<< RETURNING transaction 4");

            ALOGI("<<<<<< RETURNING transaction 4");

        } else {

            LOGI("<<<<<< RETURNING transaction %d", code);

            ALOGI("<<<<<< RETURNING transaction %d", code);

        }

        #endif
@@ -1009,7 +1009,7 @@ status_t IPCThreadState::executeCommand(int32_t cmd) 
                }

            }



            //LOGI(">>>> TRANSACT from pid %d uid %d\n", mCallingPid, mCallingUid);

            //ALOGI(">>>> TRANSACT from pid %d uid %d\n", mCallingPid, mCallingUid);

            

            Parcel reply;

            IF_LOG_TRANSACTIONS() {
@@ -1033,7 +1033,7 @@ status_t IPCThreadState::executeCommand(int32_t cmd) 
                if (error < NO_ERROR) reply.setError(error);

            }

            

            //LOGI("<<<< TRANSACT from pid %d restore pid %d uid %d\n",

            //ALOGI("<<<< TRANSACT from pid %d restore pid %d uid %d\n",

            //     mCallingPid, origPid, origUid);

            

            if ((tr.flags & TF_ONE_WAY) == 0) {
@@ -1110,7 +1110,7 @@ void IPCThreadState::freeBuffer(Parcel* parcel, const uint8_t* data, size_t data 
                                const size_t* objects, size_t objectsSize,

                                void* cookie)

{

    //LOGI("Freeing parcel %p", &parcel);

    //ALOGI("Freeing parcel %p", &parcel);

    IF_LOG_COMMANDS() {

        alog << "Writing BC_FREE_BUFFER for " << data << endl;

    }

libs/binder/IServiceManager.cpp

+3 −3
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ bool checkPermission(const String16& permission, pid_t pid, uid_t uid) 
            bool res = pc->checkPermission(permission, pid, uid);

            if (res) {

                if (startTime != 0) {

                    LOGI("Check passed after %d seconds for %s from uid=%d pid=%d",

                    ALOGI("Check passed after %d seconds for %s from uid=%d pid=%d",

                            (int)((uptimeMillis()-startTime)/1000),

                            String8(permission).string(), uid, pid);

                }
@@ -106,7 +106,7 @@ bool checkPermission(const String16& permission, pid_t pid, uid_t uid) 
            // Wait for the permission controller to come back...

            if (startTime == 0) {

                startTime = uptimeMillis();

                LOGI("Waiting to check permission %s from uid=%d pid=%d",

                ALOGI("Waiting to check permission %s from uid=%d pid=%d",

                        String8(permission).string(), uid, pid);

            }

            sleep(1);
@@ -136,7 +136,7 @@ public: 
        for (n = 0; n < 5; n++){

            sp<IBinder> svc = checkService(name);

            if (svc != NULL) return svc;

            LOGI("Waiting for service %s...\n", String8(name).string());

            ALOGI("Waiting for service %s...\n", String8(name).string());

            sleep(1);

        }

        return NULL;

libs/binder/Parcel.cpp

+6 −6
Original line number Diff line number Diff line
@@ -1088,7 +1088,7 @@ int Parcel::readFileDescriptor() const 
    if (flat) {

        switch (flat->type) {

            case BINDER_TYPE_FD:

                //LOGI("Returning file descriptor %ld from parcel %p\n", flat->handle, this);

                //ALOGI("Returning file descriptor %ld from parcel %p\n", flat->handle, this);

                return flat->handle;

        }        

    }
@@ -1218,14 +1218,14 @@ void Parcel::closeFileDescriptors() 
{

    size_t i = mObjectsSize;

    if (i > 0) {

        //LOGI("Closing file descriptors for %d objects...", mObjectsSize);

        //ALOGI("Closing file descriptors for %d objects...", mObjectsSize);

    }

    while (i > 0) {

        i--;

        const flat_binder_object* flat

            = reinterpret_cast<flat_binder_object*>(mData+mObjects[i]);

        if (flat->type == BINDER_TYPE_FD) {

            //LOGI("Closing fd: %ld\n", flat->handle);

            //ALOGI("Closing fd: %ld\n", flat->handle);

            close(flat->handle);

        }

    }
@@ -1258,7 +1258,7 @@ void Parcel::ipcSetDataReference(const uint8_t* data, size_t dataSize, 
    mError = NO_ERROR;

    mData = const_cast<uint8_t*>(data);

    mDataSize = mDataCapacity = dataSize;

    //LOGI("setDataReference Setting data size of %p to %lu (pid=%d)\n", this, mDataSize, getpid());

    //ALOGI("setDataReference Setting data size of %p to %lu (pid=%d)\n", this, mDataSize, getpid());

    mDataPos = 0;

    ALOGV("setDataReference Setting data pos of %p to %d\n", this, mDataPos);

    mObjects = const_cast<size_t*>(objects);
@@ -1332,7 +1332,7 @@ void Parcel::freeData() 
void Parcel::freeDataNoInit()

{

    if (mOwner) {

        //LOGI("Freeing data ref of %p (pid=%d)\n", this, getpid());

        //ALOGI("Freeing data ref of %p (pid=%d)\n", this, getpid());

        mOwner(this, mData, mDataSize, mObjects, mObjectsSize, mOwnerCookie);

    } else {

        releaseObjects();
@@ -1438,7 +1438,7 @@ status_t Parcel::continueWrite(size_t desired) 
        if (objects && mObjects) {

            memcpy(objects, mObjects, objectsSize*sizeof(size_t));

        }

        //LOGI("Freeing data ref of %p (pid=%d)\n", this, getpid());

        //ALOGI("Freeing data ref of %p (pid=%d)\n", this, getpid());

        mOwner(this, mData, mDataSize, mObjects, mObjectsSize, mOwnerCookie);

        mOwner = NULL;