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

Commit b72fc3d9 authored by Steve Block's avatar Steve Block Committed by Android (Google) Code Review
Browse files

Merge "Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE"

parents 50d76ddf e6f43ddc

cmds/keystore/keystore.cpp

+5 −5
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ public: 
        const char* randomDevice = "/dev/urandom";

        mRandom = ::open(randomDevice, O_RDONLY);

        if (mRandom == -1) {

            LOGE("open: %s: %s", randomDevice, strerror(errno));

            ALOGE("open: %s: %s", randomDevice, strerror(errno));

            return false;

        }

        return true;
@@ -754,11 +754,11 @@ static ResponseCode process(KeyStore* keyStore, int sock, uid_t uid, int8_t code 
int main(int argc, char* argv[]) {

    int controlSocket = android_get_control_socket("keystore");

    if (argc < 2) {

        LOGE("A directory must be specified!");

        ALOGE("A directory must be specified!");

        return 1;

    }

    if (chdir(argv[1]) == -1) {

        LOGE("chdir: %s: %s", argv[1], strerror(errno));

        ALOGE("chdir: %s: %s", argv[1], strerror(errno));

        return 1;

    }
@@ -767,7 +767,7 @@ int main(int argc, char* argv[]) { 
        return 1;

    }

    if (listen(controlSocket, 3) == -1) {

        LOGE("listen: %s", strerror(errno));

        ALOGE("listen: %s", strerror(errno));

        return 1;

    }
@@ -805,6 +805,6 @@ int main(int argc, char* argv[]) { 
        }

        close(sock);

    }

    LOGE("accept: %s", strerror(errno));

    ALOGE("accept: %s", strerror(errno));

    return 1;

}

include/utils/GenerationCache.h

+1 −1
Original line number Diff line number Diff line
@@ -205,7 +205,7 @@ bool GenerationCache<K, V>::removeOldest() { 
            removeAt(index);

            return true;

        }

        LOGE("GenerationCache: removeOldest failed to find the item in the cache "

        ALOGE("GenerationCache: removeOldest failed to find the item in the cache "

                "with the given key, but we know it must be in there.  "

                "Is the key comparator kaput?");

    }

libs/binder/BpBinder.cpp

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ void BpBinder::ObjectManager::attach( 
    e.func = func;



    if (mObjects.indexOfKey(objectID) >= 0) {

        LOGE("Trying to attach object ID %p to binder ObjectManager %p with object %p, but object ID already in use",

        ALOGE("Trying to attach object ID %p to binder ObjectManager %p with object %p, but object ID already in use",

                objectID, this,  object);

        return;

    }

libs/binder/CursorWindow.cpp

+3 −3
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ status_t CursorWindow::setNumColumns(uint32_t numColumns) { 


    uint32_t cur = mHeader->numColumns;

    if ((cur > 0 || mHeader->numRows > 0) && cur != numColumns) {

        LOGE("Trying to go from %d columns to %d", cur, numColumns);

        ALOGE("Trying to go from %d columns to %d", cur, numColumns);

        return INVALID_OPERATION;

    }

    mHeader->numColumns = numColumns;
@@ -255,14 +255,14 @@ CursorWindow::RowSlot* CursorWindow::allocRowSlot() { 


CursorWindow::FieldSlot* CursorWindow::getFieldSlot(uint32_t row, uint32_t column) {

    if (row >= mHeader->numRows || column >= mHeader->numColumns) {

        LOGE("Failed to read row %d, column %d from a CursorWindow which "

        ALOGE("Failed to read row %d, column %d from a CursorWindow which "

                "has %d rows, %d columns.",

                row, column, mHeader->numRows, mHeader->numColumns);

        return NULL;

    }

    RowSlot* rowSlot = getRowSlot(row);

    if (!rowSlot) {

        LOGE("Failed to find rowSlot for row %d.", row);

        ALOGE("Failed to find rowSlot for row %d.", row);

        return NULL;

    }

    FieldSlot* fieldDir = static_cast<FieldSlot*>(offsetToPtr(rowSlot->offset));

libs/binder/IMemory.cpp

+4 −4
Original line number Diff line number Diff line
@@ -298,11 +298,11 @@ void BpMemoryHeap::assertReallyMapped() const 
        uint32_t flags = reply.readInt32();

        uint32_t offset = reply.readInt32();



        LOGE_IF(err, "binder=%p transaction failed fd=%d, size=%ld, err=%d (%s)",

        ALOGE_IF(err, "binder=%p transaction failed fd=%d, size=%ld, err=%d (%s)",

                asBinder().get(), parcel_fd, size, err, strerror(-err));



        int fd = dup( parcel_fd );

        LOGE_IF(fd==-1, "cannot dup fd=%d, size=%ld, err=%d (%s)",

        ALOGE_IF(fd==-1, "cannot dup fd=%d, size=%ld, err=%d (%s)",

                parcel_fd, size, err, strerror(errno));



        int access = PROT_READ;
@@ -315,7 +315,7 @@ void BpMemoryHeap::assertReallyMapped() const 
            mRealHeap = true;

            mBase = mmap(0, size, access, MAP_SHARED, fd, offset);

            if (mBase == MAP_FAILED) {

                LOGE("cannot map BpMemoryHeap (binder=%p), size=%ld, fd=%d (%s)",

                ALOGE("cannot map BpMemoryHeap (binder=%p), size=%ld, fd=%d (%s)",

                        asBinder().get(), size, fd, strerror(errno));

                close(fd);

            } else {
@@ -446,7 +446,7 @@ void HeapCache::free_heap(const wp<IBinder>& binder) 
                mHeapCache.removeItemsAt(i);

            }

        } else {

            LOGE("free_heap binder=%p not found!!!", binder.unsafe_get());

            ALOGE("free_heap binder=%p not found!!!", binder.unsafe_get());

        }

    }

}