ADHOC
/
replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
This commit is contained in:
Steve Block 2012-01-04 20:05:49 +00:00
parent 3b115238cf
commit a19954ab37
22 changed files with 95 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmds/keystore/keystore.cpp
View File

@ -796,7 +796,7 @@ int main(int argc, char* argv[]) {
} else { } else {
send_code(sock, response); 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, cred.uid,
request, response, request, response,
old_state, keyStore.getState(), old_state, keyStore.getState(),

10
include/utils/ResourceTypes.h
View File

@ -1278,7 +1278,7 @@ struct ResTable_config
myDelta += requested->screenHeightDp - screenHeightDp; myDelta += requested->screenHeightDp - screenHeightDp;
otherDelta += requested->screenHeightDp - o.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, // screenWidthDp, screenHeightDp, o.screenWidthDp, o.screenHeightDp,
// requested->screenWidthDp, requested->screenHeightDp, myDelta, otherDelta); // requested->screenWidthDp, requested->screenHeightDp, myDelta, otherDelta);
return (myDelta <= otherDelta); return (myDelta <= otherDelta);
@ -1507,11 +1507,11 @@ struct ResTable_config
} }
if (screenSizeDp != 0) { if (screenSizeDp != 0) {
if (screenWidthDp != 0 && screenWidthDp > settings.screenWidthDp) { 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; return false;
} }
if (screenHeightDp != 0 && screenHeightDp > settings.screenHeightDp) { 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; return false;
} }
} }
@ -1531,9 +1531,9 @@ struct ResTable_config
// For compatibility, we count a request for KEYSHIDDEN_NO as also // For compatibility, we count a request for KEYSHIDDEN_NO as also
// matching the more recent KEYSHIDDEN_SOFT. Basically // matching the more recent KEYSHIDDEN_SOFT. Basically
// KEYSHIDDEN_NO means there is some kind of keyboard available. // 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) { if (keysHidden != KEYSHIDDEN_NO || setKeysHidden != KEYSHIDDEN_SOFT) {
//LOGI("No match!"); //ALOGI("No match!");
return false; return false;
} }
} }

16
libs/binder/IPCThreadState.cpp
View File

@ -493,7 +493,7 @@ void IPCThreadState::joinThreadPool(bool isMain)
void IPCThreadState::stopProcess(bool immediate) void IPCThreadState::stopProcess(bool immediate)
{ {
//LOGI("**** STOPPING PROCESS"); //ALOGI("**** STOPPING PROCESS");
flushCommands(); flushCommands();
int fd = mProcess->mDriverFD; int fd = mProcess->mDriverFD;
mProcess->mDriverFD = -1; mProcess->mDriverFD = -1;
@ -530,9 +530,9 @@ status_t IPCThreadState::transact(int32_t handle,
if ((flags & TF_ONE_WAY) == 0) { if ((flags & TF_ONE_WAY) == 0) {
#if 0 #if 0
if (code == 4) { // relayout if (code == 4) { // relayout
LOGI(">>>>>> CALLING transaction 4"); ALOGI(">>>>>> CALLING transaction 4");
} else { } else {
LOGI(">>>>>> CALLING transaction %d", code); ALOGI(">>>>>> CALLING transaction %d", code);
} }
#endif #endif
if (reply) { if (reply) {
@ -543,9 +543,9 @@ status_t IPCThreadState::transact(int32_t handle,
} }
#if 0 #if 0
if (code == 4) { // relayout if (code == 4) { // relayout
LOGI("<<<<<< RETURNING transaction 4"); ALOGI("<<<<<< RETURNING transaction 4");
} else { } else {
LOGI("<<<<<< RETURNING transaction %d", code); ALOGI("<<<<<< RETURNING transaction %d", code);
} }
#endif #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; Parcel reply;
IF_LOG_TRANSACTIONS() { IF_LOG_TRANSACTIONS() {
@ -1033,7 +1033,7 @@ status_t IPCThreadState::executeCommand(int32_t cmd)
if (error < NO_ERROR) reply.setError(error); 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); // mCallingPid, origPid, origUid);
if ((tr.flags & TF_ONE_WAY) == 0) { 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, const size_t* objects, size_t objectsSize,
void* cookie) void* cookie)
{ {
//LOGI("Freeing parcel %p", &parcel); //ALOGI("Freeing parcel %p", &parcel);
IF_LOG_COMMANDS() { IF_LOG_COMMANDS() {
alog << "Writing BC_FREE_BUFFER for " << data << endl; alog << "Writing BC_FREE_BUFFER for " << data << endl;
} }

6
libs/binder/IServiceManager.cpp
View File

@ -78,7 +78,7 @@ bool checkPermission(const String16& permission, pid_t pid, uid_t uid)
bool res = pc->checkPermission(permission, pid, uid); bool res = pc->checkPermission(permission, pid, uid);
if (res) { if (res) {
if (startTime != 0) { 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), (int)((uptimeMillis()-startTime)/1000),
String8(permission).string(), uid, pid); 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... // Wait for the permission controller to come back...
if (startTime == 0) { if (startTime == 0) {
startTime = uptimeMillis(); 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); String8(permission).string(), uid, pid);
} }
sleep(1); sleep(1);
@ -136,7 +136,7 @@ public:
for (n = 0; n < 5; n++){ for (n = 0; n < 5; n++){
sp<IBinder> svc = checkService(name); sp<IBinder> svc = checkService(name);
if (svc != NULL) return svc; 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); sleep(1);
} }
return NULL; return NULL;

12
libs/binder/Parcel.cpp
View File

@ -1096,7 +1096,7 @@ int Parcel::readFileDescriptor() const
if (flat) { if (flat) {
switch (flat->type) { switch (flat->type) {
case BINDER_TYPE_FD: 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; return flat->handle;
} }
} }
@ -1226,14 +1226,14 @@ void Parcel::closeFileDescriptors()
{ {
size_t i = mObjectsSize; size_t i = mObjectsSize;
if (i > 0) { if (i > 0) {
//LOGI("Closing file descriptors for %d objects...", mObjectsSize); //ALOGI("Closing file descriptors for %d objects...", mObjectsSize);
} }
while (i > 0) { while (i > 0) {
i--; i--;
const flat_binder_object* flat const flat_binder_object* flat
= reinterpret_cast<flat_binder_object*>(mData+mObjects[i]); = reinterpret_cast<flat_binder_object*>(mData+mObjects[i]);
if (flat->type == BINDER_TYPE_FD) { if (flat->type == BINDER_TYPE_FD) {
//LOGI("Closing fd: %ld\n", flat->handle); //ALOGI("Closing fd: %ld\n", flat->handle);
close(flat->handle); close(flat->handle);
} }
} }
@ -1266,7 +1266,7 @@ void Parcel::ipcSetDataReference(const uint8_t* data, size_t dataSize,
mError = NO_ERROR; mError = NO_ERROR;
mData = const_cast<uint8_t*>(data); mData = const_cast<uint8_t*>(data);
mDataSize = mDataCapacity = dataSize; 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; mDataPos = 0;
ALOGV("setDataReference Setting data pos of %p to %d\n", this, mDataPos); ALOGV("setDataReference Setting data pos of %p to %d\n", this, mDataPos);
mObjects = const_cast<size_t*>(objects); mObjects = const_cast<size_t*>(objects);
@ -1340,7 +1340,7 @@ void Parcel::freeData()
void Parcel::freeDataNoInit() void Parcel::freeDataNoInit()
{ {
if (mOwner) { 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); mOwner(this, mData, mDataSize, mObjects, mObjectsSize, mOwnerCookie);
} else { } else {
releaseObjects(); releaseObjects();
@ -1446,7 +1446,7 @@ status_t Parcel::continueWrite(size_t desired)
if (objects && mObjects) { if (objects && mObjects) {
memcpy(objects, mObjects, objectsSize*sizeof(size_t)); 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(this, mData, mDataSize, mObjects, mObjectsSize, mOwnerCookie);
mOwner = NULL; mOwner = NULL;

2
libs/gui/SurfaceTexture.cpp
View File

@ -64,7 +64,7 @@
// Macros for including the SurfaceTexture name in log messages // Macros for including the SurfaceTexture name in log messages
#define ST_LOGV(x, ...) ALOGV("[%s] "x, mName.string(), ##__VA_ARGS__) #define ST_LOGV(x, ...) ALOGV("[%s] "x, mName.string(), ##__VA_ARGS__)
#define ST_LOGD(x, ...) ALOGD("[%s] "x, mName.string(), ##__VA_ARGS__) #define ST_LOGD(x, ...) ALOGD("[%s] "x, mName.string(), ##__VA_ARGS__)
#define ST_LOGI(x, ...) LOGI("[%s] "x, mName.string(), ##__VA_ARGS__) #define ST_LOGI(x, ...) ALOGI("[%s] "x, mName.string(), ##__VA_ARGS__)
#define ST_LOGW(x, ...) LOGW("[%s] "x, mName.string(), ##__VA_ARGS__) #define ST_LOGW(x, ...) LOGW("[%s] "x, mName.string(), ##__VA_ARGS__)
#define ST_LOGE(x, ...) LOGE("[%s] "x, mName.string(), ##__VA_ARGS__) #define ST_LOGE(x, ...) LOGE("[%s] "x, mName.string(), ##__VA_ARGS__)

4
libs/utils/Asset.cpp
View File

@ -89,7 +89,7 @@ Asset::Asset(void)
gTail->mNext = this; gTail->mNext = this;
gTail = this; gTail = this;
} }
//LOGI("Creating Asset %p #%d\n", this, gCount); //ALOGI("Creating Asset %p #%d\n", this, gCount);
} }
Asset::~Asset(void) Asset::~Asset(void)
@ -109,7 +109,7 @@ Asset::~Asset(void)
mPrev->mNext = mNext; mPrev->mNext = mNext;
} }
mNext = mPrev = NULL; mNext = mPrev = NULL;
//LOGI("Destroying Asset in %p #%d\n", this, gCount); //ALOGI("Destroying Asset in %p #%d\n", this, gCount);
} }
/* /*

8
libs/utils/AssetManager.cpp
View File

@ -117,14 +117,14 @@ AssetManager::AssetManager(CacheMode cacheMode)
mCacheMode(cacheMode), mCacheValid(false) mCacheMode(cacheMode), mCacheValid(false)
{ {
int count = android_atomic_inc(&gCount)+1; int count = android_atomic_inc(&gCount)+1;
//LOGI("Creating AssetManager %p #%d\n", this, count); //ALOGI("Creating AssetManager %p #%d\n", this, count);
memset(mConfig, 0, sizeof(ResTable_config)); memset(mConfig, 0, sizeof(ResTable_config));
} }
AssetManager::~AssetManager(void) AssetManager::~AssetManager(void)
{ {
int count = android_atomic_dec(&gCount); int count = android_atomic_dec(&gCount);
//LOGI("Destroying AssetManager in %p #%d\n", this, count); //ALOGI("Destroying AssetManager in %p #%d\n", this, count);
delete mConfig; delete mConfig;
delete mResources; delete mResources;
@ -1780,7 +1780,7 @@ AssetManager::SharedZip::SharedZip(const String8& path, time_t modWhen)
: mPath(path), mZipFile(NULL), mModWhen(modWhen), : mPath(path), mZipFile(NULL), mModWhen(modWhen),
mResourceTableAsset(NULL), mResourceTable(NULL) mResourceTableAsset(NULL), mResourceTable(NULL)
{ {
//LOGI("Creating SharedZip %p %s\n", this, (const char*)mPath); //ALOGI("Creating SharedZip %p %s\n", this, (const char*)mPath);
mZipFile = new ZipFileRO; mZipFile = new ZipFileRO;
ALOGV("+++ opening zip '%s'\n", mPath.string()); ALOGV("+++ opening zip '%s'\n", mPath.string());
if (mZipFile->open(mPath.string()) != NO_ERROR) { if (mZipFile->open(mPath.string()) != NO_ERROR) {
@ -1858,7 +1858,7 @@ bool AssetManager::SharedZip::isUpToDate()
AssetManager::SharedZip::~SharedZip() AssetManager::SharedZip::~SharedZip()
{ {
//LOGI("Destroying SharedZip %p %s\n", this, (const char*)mPath); //ALOGI("Destroying SharedZip %p %s\n", this, (const char*)mPath);
if (mResourceTable != NULL) { if (mResourceTable != NULL) {
delete mResourceTable; delete mResourceTable;
} }

6
libs/utils/BackupData.cpp
View File

@ -78,7 +78,7 @@ BackupDataWriter::write_padding_for(int n)
paddingSize = padding_extra(n); paddingSize = padding_extra(n);
if (paddingSize > 0) { if (paddingSize > 0) {
uint32_t padding = 0xbcbcbcbc; uint32_t padding = 0xbcbcbcbc;
if (DEBUG) LOGI("writing %d padding bytes for %d", paddingSize, n); if (DEBUG) ALOGI("writing %d padding bytes for %d", paddingSize, n);
amt = write(m_fd, &padding, paddingSize); amt = write(m_fd, &padding, paddingSize);
if (amt != paddingSize) { if (amt != paddingSize) {
m_status = errno; m_status = errno;
@ -125,7 +125,7 @@ BackupDataWriter::WriteEntityHeader(const String8& key, size_t dataSize)
header.keyLen = tolel(keyLen); header.keyLen = tolel(keyLen);
header.dataSize = tolel(dataSize); header.dataSize = tolel(dataSize);
if (DEBUG) LOGI("writing entity header, %d bytes", sizeof(entity_header_v1)); if (DEBUG) ALOGI("writing entity header, %d bytes", sizeof(entity_header_v1));
amt = write(m_fd, &header, sizeof(entity_header_v1)); amt = write(m_fd, &header, sizeof(entity_header_v1));
if (amt != sizeof(entity_header_v1)) { if (amt != sizeof(entity_header_v1)) {
m_status = errno; m_status = errno;
@ -133,7 +133,7 @@ BackupDataWriter::WriteEntityHeader(const String8& key, size_t dataSize)
} }
m_pos += amt; m_pos += amt;
if (DEBUG) LOGI("writing entity header key, %d bytes", keyLen+1); if (DEBUG) ALOGI("writing entity header key, %d bytes", keyLen+1);
amt = write(m_fd, k.string(), keyLen+1); amt = write(m_fd, k.string(), keyLen+1);
if (amt != keyLen+1) { if (amt != keyLen+1) {
m_status = errno; m_status = errno;

2
libs/utils/BackupHelpers.cpp
View File

@ -628,7 +628,7 @@ int write_tarfile(const String8& packageName, const String8& domain,
// [ 329 : 8 ] and [ 337 : 8 ] devmajor/devminor, not used // [ 329 : 8 ] and [ 337 : 8 ] devmajor/devminor, not used
LOGI(" Name: %s", fullname.string()); ALOGI(" Name: %s", fullname.string());
// If we're using a pax extended header, build & write that here; lengths are // If we're using a pax extended header, build & write that here; lengths are
// already preflighted // already preflighted

6
libs/utils/ObbFile.cpp
View File

@ -179,14 +179,14 @@ bool ObbFile::parseObbFile(int fd)
actual = TEMP_FAILURE_RETRY(read(fd, scanBuf, footerSize)); actual = TEMP_FAILURE_RETRY(read(fd, scanBuf, footerSize));
// readAmount is guaranteed to be less than kMaxBufSize // readAmount is guaranteed to be less than kMaxBufSize
if (actual != (ssize_t)footerSize) { if (actual != (ssize_t)footerSize) {
LOGI("couldn't read ObbFile footer: %s\n", strerror(errno)); ALOGI("couldn't read ObbFile footer: %s\n", strerror(errno));
free(scanBuf); free(scanBuf);
return false; return false;
} }
#ifdef DEBUG #ifdef DEBUG
for (int i = 0; i < footerSize; ++i) { for (int i = 0; i < footerSize; ++i) {
LOGI("char: 0x%02x\n", scanBuf[i]); ALOGI("char: 0x%02x\n", scanBuf[i]);
} }
#endif #endif
@ -217,7 +217,7 @@ bool ObbFile::parseObbFile(int fd)
free(scanBuf); free(scanBuf);
#ifdef DEBUG #ifdef DEBUG
LOGI("Obb scan succeeded: packageName=%s, version=%d\n", mPackageName.string(), mVersion); ALOGI("Obb scan succeeded: packageName=%s, version=%d\n", mPackageName.string(), mVersion);
#endif #endif
return true; return true;

32
libs/utils/ResourceTypes.cpp
View File

@ -1164,7 +1164,7 @@ ResXMLTree::ResXMLTree()
: ResXMLParser(*this) : ResXMLParser(*this)
, mError(NO_INIT), mOwnedData(NULL) , mError(NO_INIT), mOwnedData(NULL)
{ {
//LOGI("Creating ResXMLTree %p #%d\n", this, android_atomic_inc(&gCount)+1); //ALOGI("Creating ResXMLTree %p #%d\n", this, android_atomic_inc(&gCount)+1);
restart(); restart();
} }
@ -1172,13 +1172,13 @@ ResXMLTree::ResXMLTree(const void* data, size_t size, bool copyData)
: ResXMLParser(*this) : ResXMLParser(*this)
, mError(NO_INIT), mOwnedData(NULL) , mError(NO_INIT), mOwnedData(NULL)
{ {
//LOGI("Creating ResXMLTree %p #%d\n", this, android_atomic_inc(&gCount)+1); //ALOGI("Creating ResXMLTree %p #%d\n", this, android_atomic_inc(&gCount)+1);
setTo(data, size, copyData); setTo(data, size, copyData);
} }
ResXMLTree::~ResXMLTree() ResXMLTree::~ResXMLTree()
{ {
//LOGI("Destroying ResXMLTree in %p #%d\n", this, android_atomic_dec(&gCount)-1); //ALOGI("Destroying ResXMLTree in %p #%d\n", this, android_atomic_dec(&gCount)-1);
uninit(); uninit();
} }
@ -1631,7 +1631,7 @@ status_t ResTable::Theme::applyStyle(uint32_t resID, bool force)
mTable.unlock(); mTable.unlock();
//LOGI("Applying style 0x%08x (force=%d) theme %p...\n", resID, force, this); //ALOGI("Applying style 0x%08x (force=%d) theme %p...\n", resID, force, this);
//dumpToLog(); //dumpToLog();
return NO_ERROR; return NO_ERROR;
@ -1639,7 +1639,7 @@ status_t ResTable::Theme::applyStyle(uint32_t resID, bool force)
status_t ResTable::Theme::setTo(const Theme& other) status_t ResTable::Theme::setTo(const Theme& other)
{ {
//LOGI("Setting theme %p from theme %p...\n", this, &other); //ALOGI("Setting theme %p from theme %p...\n", this, &other);
//dumpToLog(); //dumpToLog();
//other.dumpToLog(); //other.dumpToLog();
@ -1670,7 +1670,7 @@ status_t ResTable::Theme::setTo(const Theme& other)
} }
} }
//LOGI("Final theme:"); //ALOGI("Final theme:");
//dumpToLog(); //dumpToLog();
return NO_ERROR; return NO_ERROR;
@ -1752,21 +1752,21 @@ ssize_t ResTable::Theme::resolveAttributeReference(Res_value* inOutValue,
void ResTable::Theme::dumpToLog() const void ResTable::Theme::dumpToLog() const
{ {
LOGI("Theme %p:\n", this); ALOGI("Theme %p:\n", this);
for (size_t i=0; i<Res_MAXPACKAGE; i++) { for (size_t i=0; i<Res_MAXPACKAGE; i++) {
package_info* pi = mPackages[i]; package_info* pi = mPackages[i];
if (pi == NULL) continue; if (pi == NULL) continue;
LOGI(" Package #0x%02x:\n", (int)(i+1)); ALOGI(" Package #0x%02x:\n", (int)(i+1));
for (size_t j=0; j<pi->numTypes; j++) { for (size_t j=0; j<pi->numTypes; j++) {
type_info& ti = pi->types[j]; type_info& ti = pi->types[j];
if (ti.numEntries == 0) continue; if (ti.numEntries == 0) continue;
LOGI(" Type #0x%02x:\n", (int)(j+1)); ALOGI(" Type #0x%02x:\n", (int)(j+1));
for (size_t k=0; k<ti.numEntries; k++) { for (size_t k=0; k<ti.numEntries; k++) {
theme_entry& te = ti.entries[k]; theme_entry& te = ti.entries[k];
if (te.value.dataType == Res_value::TYPE_NULL) continue; if (te.value.dataType == Res_value::TYPE_NULL) continue;
LOGI(" 0x%08x: t=0x%x, d=0x%08x (block=%d)\n", ALOGI(" 0x%08x: t=0x%x, d=0x%08x (block=%d)\n",
(int)Res_MAKEID(i, j, k), (int)Res_MAKEID(i, j, k),
te.value.dataType, (int)te.value.data, (int)te.stringBlock); te.value.dataType, (int)te.value.data, (int)te.stringBlock);
} }
@ -1779,7 +1779,7 @@ ResTable::ResTable()
{ {
memset(&mParams, 0, sizeof(mParams)); memset(&mParams, 0, sizeof(mParams));
memset(mPackageMap, 0, sizeof(mPackageMap)); memset(mPackageMap, 0, sizeof(mPackageMap));
//LOGI("Creating ResTable %p\n", this); //ALOGI("Creating ResTable %p\n", this);
} }
ResTable::ResTable(const void* data, size_t size, void* cookie, bool copyData) ResTable::ResTable(const void* data, size_t size, void* cookie, bool copyData)
@ -1789,12 +1789,12 @@ ResTable::ResTable(const void* data, size_t size, void* cookie, bool copyData)
memset(mPackageMap, 0, sizeof(mPackageMap)); memset(mPackageMap, 0, sizeof(mPackageMap));
add(data, size, cookie, copyData); add(data, size, cookie, copyData);
LOG_FATAL_IF(mError != NO_ERROR, "Error parsing resource table"); LOG_FATAL_IF(mError != NO_ERROR, "Error parsing resource table");
//LOGI("Creating ResTable %p\n", this); //ALOGI("Creating ResTable %p\n", this);
} }
ResTable::~ResTable() ResTable::~ResTable()
{ {
//LOGI("Destroying ResTable in %p\n", this); //ALOGI("Destroying ResTable in %p\n", this);
uninit(); uninit();
} }
@ -1881,7 +1881,7 @@ status_t ResTable::add(const void* data, size_t size, void* cookie,
header->header = (const ResTable_header*)data; header->header = (const ResTable_header*)data;
header->size = dtohl(header->header->header.size); header->size = dtohl(header->header->header.size);
//LOGI("Got size 0x%x, again size 0x%x, raw size 0x%x\n", header->size, //ALOGI("Got size 0x%x, again size 0x%x, raw size 0x%x\n", header->size,
// dtohl(header->header->header.size), header->header->header.size); // dtohl(header->header->header.size), header->header->header.size);
LOAD_TABLE_NOISY(LOGV("Loading ResTable @%p:\n", header->header)); LOAD_TABLE_NOISY(LOGV("Loading ResTable @%p:\n", header->header));
LOAD_TABLE_NOISY(printHexData(2, header->header, header->size < 256 ? header->size : 256, LOAD_TABLE_NOISY(printHexData(2, header->header, header->size < 256 ? header->size : 256,
@ -2350,7 +2350,7 @@ ssize_t ResTable::getBagLocked(uint32_t resID, const bag_entry** outBag,
*outTypeSpecFlags = set->typeSpecFlags; *outTypeSpecFlags = set->typeSpecFlags;
} }
*outBag = (bag_entry*)(set+1); *outBag = (bag_entry*)(set+1);
//LOGI("Found existing bag for: %p\n", (void*)resID); //ALOGI("Found existing bag for: %p\n", (void*)resID);
return set->numAttrs; return set->numAttrs;
} }
LOGW("Attempt to retrieve bag 0x%08x which is invalid or in a cycle.", LOGW("Attempt to retrieve bag 0x%08x which is invalid or in a cycle.",
@ -4273,7 +4273,7 @@ status_t ResTable::parsePackage(const ResTable_package* const pkg,
TABLE_GETENTRY( TABLE_GETENTRY(
ResTable_config thisConfig; ResTable_config thisConfig;
thisConfig.copyFromDtoH(type->config); thisConfig.copyFromDtoH(type->config);
LOGI("Adding config to type %d: imsi:%d/%d lang:%c%c cnt:%c%c " ALOGI("Adding config to type %d: imsi:%d/%d lang:%c%c cnt:%c%c "
"orien:%d touch:%d density:%d key:%d inp:%d nav:%d w:%d h:%d " "orien:%d touch:%d density:%d key:%d inp:%d nav:%d w:%d h:%d "
"swdp:%d wdp:%d hdp:%d\n", "swdp:%d wdp:%d hdp:%d\n",
type->id, type->id,

4
libs/utils/Static.cpp
View File

@ -57,8 +57,8 @@ protected:
virtual status_t writeLines(const struct iovec& vec, size_t N) virtual status_t writeLines(const struct iovec& vec, size_t N)
{ {
//android_writevLog(&vec, N); <-- this is now a no-op //android_writevLog(&vec, N); <-- this is now a no-op
if (N != 1) LOGI("WARNING: writeLines N=%d\n", N); if (N != 1) ALOGI("WARNING: writeLines N=%d\n", N);
LOGI("%.*s", vec.iov_len, (const char*) vec.iov_base); ALOGI("%.*s", vec.iov_len, (const char*) vec.iov_base);
return NO_ERROR; return NO_ERROR;
} }
}; };

6
libs/utils/ZipFileRO.cpp
View File

@ -210,7 +210,7 @@ bool ZipFileRO::mapCentralDirectory(void)
ssize_t actual = TEMP_FAILURE_RETRY(read(mFd, scanBuf, sizeof(int32_t))); ssize_t actual = TEMP_FAILURE_RETRY(read(mFd, scanBuf, sizeof(int32_t)));
if (actual != (ssize_t) sizeof(int32_t)) { if (actual != (ssize_t) sizeof(int32_t)) {
LOGI("couldn't read first signature from zip archive: %s", strerror(errno)); ALOGI("couldn't read first signature from zip archive: %s", strerror(errno));
free(scanBuf); free(scanBuf);
return false; return false;
} }
@ -218,7 +218,7 @@ bool ZipFileRO::mapCentralDirectory(void)
{ {
unsigned int header = get4LE(scanBuf); unsigned int header = get4LE(scanBuf);
if (header == kEOCDSignature) { if (header == kEOCDSignature) {
LOGI("Found Zip archive, but it looks empty\n"); ALOGI("Found Zip archive, but it looks empty\n");
free(scanBuf); free(scanBuf);
return false; return false;
} else if (header != kLFHSignature) { } else if (header != kLFHSignature) {
@ -761,7 +761,7 @@ bool ZipFileRO::uncompressEntry(ZipEntryRO entry, int fd) const
(ZD_TYPE) actual, (ZD_TYPE) uncompLen); (ZD_TYPE) actual, (ZD_TYPE) uncompLen);
goto unmap; goto unmap;
} else { } else {
LOGI("+++ successful write\n"); ALOGI("+++ successful write\n");
} }
} else { } else {
if (!inflateBuffer(fd, ptr, uncompLen, compLen)) if (!inflateBuffer(fd, ptr, uncompLen, compLen))

8
opengl/tests/gl2_jni/jni/gl_code.cpp
View File

@ -14,13 +14,13 @@
static void printGLString(const char *name, GLenum s) { static void printGLString(const char *name, GLenum s) {
const char *v = (const char *) glGetString(s); const char *v = (const char *) glGetString(s);
LOGI("GL %s = %s\n", name, v); ALOGI("GL %s = %s\n", name, v);
} }
static void checkGlError(const char* op) { static void checkGlError(const char* op) {
for (GLint error = glGetError(); error; error for (GLint error = glGetError(); error; error
= glGetError()) { = glGetError()) {
LOGI("after %s() glError (0x%x)\n", op, error); ALOGI("after %s() glError (0x%x)\n", op, error);
} }
} }
@ -107,7 +107,7 @@ bool setupGraphics(int w, int h) {
printGLString("Renderer", GL_RENDERER); printGLString("Renderer", GL_RENDERER);
printGLString("Extensions", GL_EXTENSIONS); printGLString("Extensions", GL_EXTENSIONS);
LOGI("setupGraphics(%d, %d)", w, h); ALOGI("setupGraphics(%d, %d)", w, h);
gProgram = createProgram(gVertexShader, gFragmentShader); gProgram = createProgram(gVertexShader, gFragmentShader);
if (!gProgram) { if (!gProgram) {
LOGE("Could not create program."); LOGE("Could not create program.");
@ -115,7 +115,7 @@ bool setupGraphics(int w, int h) {
} }
gvPositionHandle = glGetAttribLocation(gProgram, "vPosition"); gvPositionHandle = glGetAttribLocation(gProgram, "vPosition");
checkGlError("glGetAttribLocation"); checkGlError("glGetAttribLocation");
LOGI("glGetAttribLocation(\"vPosition\") = %d\n", ALOGI("glGetAttribLocation(\"vPosition\") = %d\n",
gvPositionHandle); gvPositionHandle);
glViewport(0, 0, w, h); glViewport(0, 0, w, h);

2
opengl/tests/gl_jni/jni/gl_code.cpp
View File

@ -18,7 +18,7 @@ GLfloat background;
static void printGLString(const char *name, GLenum s) { static void printGLString(const char *name, GLenum s) {
const char *v = (const char *) glGetString(s); const char *v = (const char *) glGetString(s);
LOGI("GL %s = %s\n", name, v); ALOGI("GL %s = %s\n", name, v);
} }
static void gluLookAt(float eyeX, float eyeY, float eyeZ, static void gluLookAt(float eyeX, float eyeY, float eyeZ,

2
opengl/tests/gl_perf/fill_common.cpp
View File

@ -132,7 +132,7 @@ static void endTimer(int count) {
} else { } else {
printf("%s, %f, %f\n", gCurrentTestName, mpps, dc60); printf("%s, %f, %f\n", gCurrentTestName, mpps, dc60);
} }
LOGI("%s, %f, %f\r\n", gCurrentTestName, mpps, dc60); ALOGI("%s, %f, %f\r\n", gCurrentTestName, mpps, dc60);
} }

10
opengl/tests/gl_perfapp/jni/gl_code.cpp
View File

@ -43,7 +43,7 @@ void doTest() {
int texSize = ((stateClock >> 1) & 0x1) + 1; int texSize = ((stateClock >> 1) & 0x1) + 1;
if (testNum >= gFragmentTestCount) { if (testNum >= gFragmentTestCount) {
LOGI("done\n"); ALOGI("done\n");
if (fOut) { if (fOut) {
fclose(fOut); fclose(fOut);
fOut = NULL; fOut = NULL;
@ -52,7 +52,7 @@ void doTest() {
return; return;
} }
// LOGI("doTest %d %d %d\n", texCount, extraMath, testSubState); // ALOGI("doTest %d %d %d\n", texCount, extraMath, testSubState);
// for (uint32_t num = 0; num < gFragmentTestCount; num++) { // for (uint32_t num = 0; num < gFragmentTestCount; num++) {
doSingleTest(testNum, texSize); doSingleTest(testNum, texSize);
@ -74,17 +74,17 @@ JNIEXPORT void JNICALL Java_com_android_glperf_GLPerfLib_init(JNIEnv * env, jobj
genTextures(); genTextures();
const char* fileName = "/sdcard/glperf.csv"; const char* fileName = "/sdcard/glperf.csv";
if (fOut != NULL) { if (fOut != NULL) {
LOGI("Closing partially written output.n"); ALOGI("Closing partially written output.n");
fclose(fOut); fclose(fOut);
fOut = NULL; fOut = NULL;
} }
LOGI("Writing to: %s\n",fileName); ALOGI("Writing to: %s\n",fileName);
fOut = fopen(fileName, "w"); fOut = fopen(fileName, "w");
if (fOut == NULL) { if (fOut == NULL) {
LOGE("Could not open: %s\n", fileName); LOGE("Could not open: %s\n", fileName);
} }
LOGI("\nvarColor, texCount, modulate, extraMath, texSize, blend, Mpps, DC60\n"); ALOGI("\nvarColor, texCount, modulate, extraMath, texSize, blend, Mpps, DC60\n");
if (fOut) fprintf(fOut,"varColor, texCount, modulate, extraMath, texSize, blend, Mpps, DC60\r\n"); if (fOut) fprintf(fOut,"varColor, texCount, modulate, extraMath, texSize, blend, Mpps, DC60\r\n");
} }
} }

8
opengl/tests/gldual/jni/gl_code.cpp
View File

@ -14,13 +14,13 @@
static void printGLString(const char *name, GLenum s) { static void printGLString(const char *name, GLenum s) {
const char *v = (const char *) glGetString(s); const char *v = (const char *) glGetString(s);
LOGI("GL %s = %s\n", name, v); ALOGI("GL %s = %s\n", name, v);
} }
static void checkGlError(const char* op) { static void checkGlError(const char* op) {
for (GLint error = glGetError(); error; error for (GLint error = glGetError(); error; error
= glGetError()) { = glGetError()) {
LOGI("after %s() glError (0x%x)\n", op, error); ALOGI("after %s() glError (0x%x)\n", op, error);
} }
} }
@ -107,7 +107,7 @@ bool setupGraphics(int w, int h) {
printGLString("Renderer", GL_RENDERER); printGLString("Renderer", GL_RENDERER);
printGLString("Extensions", GL_EXTENSIONS); printGLString("Extensions", GL_EXTENSIONS);
LOGI("setupGraphics(%d, %d)", w, h); ALOGI("setupGraphics(%d, %d)", w, h);
gProgram = createProgram(gVertexShader, gFragmentShader); gProgram = createProgram(gVertexShader, gFragmentShader);
if (!gProgram) { if (!gProgram) {
LOGE("Could not create program."); LOGE("Could not create program.");
@ -115,7 +115,7 @@ bool setupGraphics(int w, int h) {
} }
gvPositionHandle = glGetAttribLocation(gProgram, "vPosition"); gvPositionHandle = glGetAttribLocation(gProgram, "vPosition");
checkGlError("glGetAttribLocation"); checkGlError("glGetAttribLocation");
LOGI("glGetAttribLocation(\"vPosition\") = %d\n", ALOGI("glGetAttribLocation(\"vPosition\") = %d\n",
gvPositionHandle); gvPositionHandle);
glViewport(0, 0, w, h); glViewport(0, 0, w, h);

30
services/surfaceflinger/DisplayHardware/DisplayHardware.cpp
View File

@ -287,22 +287,22 @@ void DisplayHardware::init(uint32_t dpy)
glGetIntegerv(GL_MAX_TEXTURE_SIZE, &mMaxTextureSize); glGetIntegerv(GL_MAX_TEXTURE_SIZE, &mMaxTextureSize);
glGetIntegerv(GL_MAX_VIEWPORT_DIMS, mMaxViewportDims); glGetIntegerv(GL_MAX_VIEWPORT_DIMS, mMaxViewportDims);
LOGI("EGL informations:"); ALOGI("EGL informations:");
LOGI("# of configs : %d", numConfigs); ALOGI("# of configs : %d", numConfigs);
LOGI("vendor : %s", extensions.getEglVendor()); ALOGI("vendor : %s", extensions.getEglVendor());
LOGI("version : %s", extensions.getEglVersion()); ALOGI("version : %s", extensions.getEglVersion());
LOGI("extensions: %s", extensions.getEglExtension()); ALOGI("extensions: %s", extensions.getEglExtension());
LOGI("Client API: %s", eglQueryString(display, EGL_CLIENT_APIS)?:"Not Supported"); ALOGI("Client API: %s", eglQueryString(display, EGL_CLIENT_APIS)?:"Not Supported");
LOGI("EGLSurface: %d-%d-%d-%d, config=%p", r, g, b, a, config); ALOGI("EGLSurface: %d-%d-%d-%d, config=%p", r, g, b, a, config);
LOGI("OpenGL informations:"); ALOGI("OpenGL informations:");
LOGI("vendor : %s", extensions.getVendor()); ALOGI("vendor : %s", extensions.getVendor());
LOGI("renderer : %s", extensions.getRenderer()); ALOGI("renderer : %s", extensions.getRenderer());
LOGI("version : %s", extensions.getVersion()); ALOGI("version : %s", extensions.getVersion());
LOGI("extensions: %s", extensions.getExtension()); ALOGI("extensions: %s", extensions.getExtension());
LOGI("GL_MAX_TEXTURE_SIZE = %d", mMaxTextureSize); ALOGI("GL_MAX_TEXTURE_SIZE = %d", mMaxTextureSize);
LOGI("GL_MAX_VIEWPORT_DIMS = %d x %d", mMaxViewportDims[0], mMaxViewportDims[1]); ALOGI("GL_MAX_VIEWPORT_DIMS = %d x %d", mMaxViewportDims[0], mMaxViewportDims[1]);
LOGI("flags = %08x", mFlags); ALOGI("flags = %08x", mFlags);
// Unbind the context from this thread // Unbind the context from this thread
eglMakeCurrent(display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT); eglMakeCurrent(display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);

2
services/surfaceflinger/EventThread.cpp
View File

@ -209,7 +209,7 @@ bool EventThread::threadLoop() {
} }
status_t EventThread::readyToRun() { status_t EventThread::readyToRun() {
LOGI("EventThread ready to run."); ALOGI("EventThread ready to run.");
return NO_ERROR; return NO_ERROR;
} }

12
services/surfaceflinger/SurfaceFlinger.cpp
View File

@ -110,7 +110,7 @@ SurfaceFlinger::SurfaceFlinger()
void SurfaceFlinger::init() void SurfaceFlinger::init()
{ {
LOGI("SurfaceFlinger is starting"); ALOGI("SurfaceFlinger is starting");
// debugging stuff... // debugging stuff...
char value[PROPERTY_VALUE_MAX]; char value[PROPERTY_VALUE_MAX];
@ -127,9 +127,9 @@ void SurfaceFlinger::init()
DdmConnection::start(getServiceName()); DdmConnection::start(getServiceName());
} }
LOGI_IF(mDebugRegion, "showupdates enabled"); ALOGI_IF(mDebugRegion, "showupdates enabled");
LOGI_IF(mDebugBackground, "showbackground enabled"); ALOGI_IF(mDebugBackground, "showbackground enabled");
LOGI_IF(mDebugDDMS, "DDMS debugging enabled"); ALOGI_IF(mDebugDDMS, "DDMS debugging enabled");
} }
SurfaceFlinger::~SurfaceFlinger() SurfaceFlinger::~SurfaceFlinger()
@ -176,7 +176,7 @@ void SurfaceFlinger::bootFinished()
{ {
const nsecs_t now = systemTime(); const nsecs_t now = systemTime();
const nsecs_t duration = now - mBootTime; const nsecs_t duration = now - mBootTime;
LOGI("Boot is finished (%ld ms)", long(ns2ms(duration)) ); ALOGI("Boot is finished (%ld ms)", long(ns2ms(duration)) );
mBootFinished = true; mBootFinished = true;
// wait patiently for the window manager death // wait patiently for the window manager death
@ -215,7 +215,7 @@ static inline uint16_t pack565(int r, int g, int b) {
status_t SurfaceFlinger::readyToRun() status_t SurfaceFlinger::readyToRun()
{ {
LOGI( "SurfaceFlinger's main thread ready to run. " ALOGI( "SurfaceFlinger's main thread ready to run. "
"Initializing graphics H/W..."); "Initializing graphics H/W...");
// we only support one display currently // we only support one display currently