Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/156801
Bug: 5449033
Change-Id: Ib08fe86d23db91ee153e9f91a99a35c42b9208ea
diff --git a/libs/binder/IPCThreadState.cpp b/libs/binder/IPCThreadState.cpp
index 641134a..a42c336 100644
--- a/libs/binder/IPCThreadState.cpp
+++ b/libs/binder/IPCThreadState.cpp
@@ -493,7 +493,7 @@
void IPCThreadState::stopProcess(bool immediate)
{
- //LOGI("**** STOPPING PROCESS");
+ //ALOGI("**** STOPPING PROCESS");
flushCommands();
int fd = mProcess->mDriverFD;
mProcess->mDriverFD = -1;
@@ -530,9 +530,9 @@
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 @@
}
#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 @@
}
}
- //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 @@
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 @@
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;
}
diff --git a/libs/binder/IServiceManager.cpp b/libs/binder/IServiceManager.cpp
index 1fa4c35..1c1b546 100644
--- a/libs/binder/IServiceManager.cpp
+++ b/libs/binder/IServiceManager.cpp
@@ -78,7 +78,7 @@
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 @@
// 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 @@
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;
diff --git a/libs/binder/Parcel.cpp b/libs/binder/Parcel.cpp
index 4ec2243..e455980 100644
--- a/libs/binder/Parcel.cpp
+++ b/libs/binder/Parcel.cpp
@@ -1096,7 +1096,7 @@
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;
}
}
@@ -1226,14 +1226,14 @@
{
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);
}
}
@@ -1266,7 +1266,7 @@
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);
@@ -1340,7 +1340,7 @@
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();
@@ -1446,7 +1446,7 @@
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;