Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/156016
Bug: 5449033
Change-Id: I4c4e33bb9df3e39e11cd985e193e6fbab4635298
diff --git a/IMemory.cpp b/IMemory.cpp
index 1ace8f8..2111fe8 100644
--- a/IMemory.cpp
+++ b/IMemory.cpp
@@ -244,7 +244,7 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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);
diff --git a/MemoryDealer.cpp b/MemoryDealer.cpp
index fc3e31e..f299924 100644
--- a/MemoryDealer.cpp
+++ b/MemoryDealer.cpp
@@ -415,7 +415,7 @@
{
String8 result;
dump_l(result, what);
- LOGD("%s", result.string());
+ ALOGD("%s", result.string());
}
void SimpleBestFitAllocator::dump(String8& result,
diff --git a/MemoryHeapBase.cpp b/MemoryHeapBase.cpp
index bf4a73f..e171374 100644
--- a/MemoryHeapBase.cpp
+++ b/MemoryHeapBase.cpp
@@ -132,7 +132,7 @@
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 @@
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;
diff --git a/Parcel.cpp b/Parcel.cpp
index 6cd43aa..4ec2243 100644
--- a/Parcel.cpp
+++ b/Parcel.cpp
@@ -103,7 +103,7 @@
}
}
- 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 @@
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);
diff --git a/PermissionCache.cpp b/PermissionCache.cpp
index 7278187..a503be8 100644
--- a/PermissionCache.cpp
+++ b/PermissionCache.cpp
@@ -101,7 +101,7 @@
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);