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

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

am 7ae84204: am ba7f0d2a: Merge "Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)" 

* commit '7ae84204c14b4abff70fcc19c3c33de2591df34b':
  Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)
parents fa73dc2e 1d990804

libs/binder/IMemory.cpp

+6 −6
Original line number Diff line number Diff line
@@ -244,7 +244,7 @@ BpMemoryHeap::~BpMemoryHeap() { 
                sp<IBinder> binder = const_cast<BpMemoryHeap*>(this)->asBinder();



                if (VERBOSE) {

                    LOGD("UNMAPPING binder=%p, heap=%p, size=%d, fd=%d",

                    ALOGD("UNMAPPING binder=%p, heap=%p, size=%d, fd=%d",

                            binder.get(), this, mSize, mHeapId);

                    CallStack stack;

                    stack.update();
@@ -393,7 +393,7 @@ HeapCache::~HeapCache() 


void HeapCache::binderDied(const wp<IBinder>& binder)

{

    //LOGD("binderDied binder=%p", binder.unsafe_get());

    //ALOGD("binderDied binder=%p", binder.unsafe_get());

    free_heap(binder);

}
@@ -403,7 +403,7 @@ sp<IMemoryHeap> HeapCache::find_heap(const sp<IBinder>& binder) 
    ssize_t i = mHeapCache.indexOfKey(binder);

    if (i>=0) {

        heap_info_t& info = mHeapCache.editValueAt(i);

        LOGD_IF(VERBOSE,

        ALOGD_IF(VERBOSE,

                "found binder=%p, heap=%p, size=%d, fd=%d, count=%d",

                binder.get(), info.heap.get(),

                static_cast<BpMemoryHeap*>(info.heap.get())->mSize,
@@ -415,7 +415,7 @@ sp<IMemoryHeap> HeapCache::find_heap(const sp<IBinder>& binder) 
        heap_info_t info;

        info.heap = interface_cast<IMemoryHeap>(binder);

        info.count = 1;

        //LOGD("adding binder=%p, heap=%p, count=%d",

        //ALOGD("adding binder=%p, heap=%p, count=%d",

        //      binder.get(), info.heap.get(), info.count);

        mHeapCache.add(binder, info);

        return info.heap;
@@ -436,7 +436,7 @@ void HeapCache::free_heap(const wp<IBinder>& binder) 
            heap_info_t& info(mHeapCache.editValueAt(i));

            int32_t c = android_atomic_dec(&info.count);

            if (c == 1) {

                LOGD_IF(VERBOSE,

                ALOGD_IF(VERBOSE,

                        "removing binder=%p, heap=%p, size=%d, fd=%d, count=%d",

                        binder.unsafe_get(), info.heap.get(),

                        static_cast<BpMemoryHeap*>(info.heap.get())->mSize,
@@ -468,7 +468,7 @@ void HeapCache::dump_heaps() 
    for (int i=0 ; i<c ; i++) {

        const heap_info_t& info = mHeapCache.valueAt(i);

        BpMemoryHeap const* h(static_cast<BpMemoryHeap const *>(info.heap.get()));

        LOGD("hey=%p, heap=%p, count=%d, (fd=%d, base=%p, size=%d)",

        ALOGD("hey=%p, heap=%p, count=%d, (fd=%d, base=%p, size=%d)",

                mHeapCache.keyAt(i).unsafe_get(),

                info.heap.get(), info.count,

                h->mHeapId, h->mBase, h->mSize);

libs/binder/MemoryDealer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -411,7 +411,7 @@ void SimpleBestFitAllocator::dump_l(const char* what) const 
{

    String8 result;

    dump_l(result, what);

    LOGD("%s", result.string());

    ALOGD("%s", result.string());

}



void SimpleBestFitAllocator::dump(String8& result,

libs/binder/MemoryHeapBase.cpp

+2 −2
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ status_t MemoryHeapBase::mapfd(int fd, size_t size, uint32_t offset) 
            close(fd);

            return -errno;

        }

        //LOGD("mmap(fd=%d, base=%p, size=%lu)", fd, base, size);

        //ALOGD("mmap(fd=%d, base=%p, size=%lu)", fd, base, size);

        mBase = base;

        mNeedUnmap = true;

    } else  {
@@ -155,7 +155,7 @@ void MemoryHeapBase::dispose() 
    int fd = android_atomic_or(-1, &mFD);

    if (fd >= 0) {

        if (mNeedUnmap) {

            //LOGD("munmap(fd=%d, base=%p, size=%lu)", fd, mBase, mSize);

            //ALOGD("munmap(fd=%d, base=%p, size=%lu)", fd, mBase, mSize);

            munmap(mBase, mSize);

        }

        mBase = 0;

libs/binder/Parcel.cpp

+2 −2
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ void acquire_object(const sp<ProcessState>& proc, 
        }

    }



    LOGD("Invalid object type 0x%08lx", obj.type);

    ALOGD("Invalid object type 0x%08lx", obj.type);

}



void release_object(const sp<ProcessState>& proc,
@@ -703,7 +703,7 @@ status_t Parcel::writeNativeHandle(const native_handle* handle) 
        err = writeDupFileDescriptor(handle->data[i]);



    if (err != NO_ERROR) {

        LOGD("write native handle, write dup fd failed");

        ALOGD("write native handle, write dup fd failed");

        return err;

    }

    err = write(handle->data + handle->numFds, sizeof(int)*handle->numInts);

libs/binder/PermissionCache.cpp

+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ bool PermissionCache::checkPermission( 
        nsecs_t t = -systemTime();

        granted = android::checkPermission(permission, pid, uid);

        t += systemTime();

        LOGD("checking %s for uid=%d => %s (%d us)",

        ALOGD("checking %s for uid=%d => %s (%d us)",

                String8(permission).string(), uid,

                granted?"granted":"denied", (int)ns2us(t));

        pc.cache(permission, uid, granted);