openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects 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 committed by Alex Ray
parent eb0953307c
commit a1d3391b1e
9 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/utils/ResourceTypes.h
View File

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

4
libs/utils/Asset.cpp
View File

@ -89,7 +89,7 @@ Asset::Asset(void)
gTail->mNext = this;
gTail = this;
}
//LOGI("Creating Asset %p #%d\n", this, gCount);
//ALOGI("Creating Asset %p #%d\n", this, gCount);
}
Asset::~Asset(void)
@ -109,7 +109,7 @@ Asset::~Asset(void)
mPrev->mNext = mNext;
}
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)
{
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));
}
AssetManager::~AssetManager(void)
{
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 mResources;
@ -1780,7 +1780,7 @@ AssetManager::SharedZip::SharedZip(const String8& path, time_t modWhen)
: mPath(path), mZipFile(NULL), mModWhen(modWhen),
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;
ALOGV("+++ opening zip '%s'\n", mPath.string());
if (mZipFile->open(mPath.string()) != NO_ERROR) {
@ -1858,7 +1858,7 @@ bool AssetManager::SharedZip::isUpToDate()
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) {
delete mResourceTable;
}

6
libs/utils/BackupData.cpp
View File

@ -78,7 +78,7 @@ BackupDataWriter::write_padding_for(int n)
paddingSize = padding_extra(n);
if (paddingSize > 0) {
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);
if (amt != paddingSize) {
m_status = errno;
@ -125,7 +125,7 @@ BackupDataWriter::WriteEntityHeader(const String8& key, size_t dataSize)
header.keyLen = tolel(keyLen);
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));
if (amt != sizeof(entity_header_v1)) {
m_status = errno;
@ -133,7 +133,7 @@ BackupDataWriter::WriteEntityHeader(const String8& key, size_t dataSize)
}
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);
if (amt != keyLen+1) {
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
LOGI(" Name: %s", fullname.string());
ALOGI(" Name: %s", fullname.string());
// If we're using a pax extended header, build & write that here; lengths are
// 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));
// readAmount is guaranteed to be less than kMaxBufSize
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);
return false;
}
#ifdef DEBUG
for (int i = 0; i < footerSize; ++i) {
LOGI("char: 0x%02x\n", scanBuf[i]);
ALOGI("char: 0x%02x\n", scanBuf[i]);
}
#endif
@ -217,7 +217,7 @@ bool ObbFile::parseObbFile(int fd)
free(scanBuf);
#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
return true;

32
libs/utils/ResourceTypes.cpp
View File

@ -1164,7 +1164,7 @@ ResXMLTree::ResXMLTree()
: ResXMLParser(*this)
, 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();
}
@ -1172,13 +1172,13 @@ ResXMLTree::ResXMLTree(const void* data, size_t size, bool copyData)
: ResXMLParser(*this)
, 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);
}
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();
}
@ -1631,7 +1631,7 @@ status_t ResTable::Theme::applyStyle(uint32_t resID, bool force)
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();
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)
{
//LOGI("Setting theme %p from theme %p...\n", this, &other);
//ALOGI("Setting theme %p from theme %p...\n", this, &other);
//dumpToLog();
//other.dumpToLog();
@ -1670,7 +1670,7 @@ status_t ResTable::Theme::setTo(const Theme& other)
}
}
//LOGI("Final theme:");
//ALOGI("Final theme:");
//dumpToLog();
return NO_ERROR;
@ -1752,21 +1752,21 @@ ssize_t ResTable::Theme::resolveAttributeReference(Res_value* inOutValue,
void ResTable::Theme::dumpToLog() const
{
LOGI("Theme %p:\n", this);
ALOGI("Theme %p:\n", this);
for (size_t i=0; i<Res_MAXPACKAGE; i++) {
package_info* pi = mPackages[i];
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++) {
type_info& ti = pi->types[j];
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++) {
theme_entry& te = ti.entries[k];
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),
te.value.dataType, (int)te.value.data, (int)te.stringBlock);
}
@ -1779,7 +1779,7 @@ ResTable::ResTable()
{
memset(&mParams, 0, sizeof(mParams));
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)
@ -1789,12 +1789,12 @@ ResTable::ResTable(const void* data, size_t size, void* cookie, bool copyData)
memset(mPackageMap, 0, sizeof(mPackageMap));
add(data, size, cookie, copyData);
LOG_FATAL_IF(mError != NO_ERROR, "Error parsing resource table");
//LOGI("Creating ResTable %p\n", this);
//ALOGI("Creating ResTable %p\n", this);
}
ResTable::~ResTable()
{
//LOGI("Destroying ResTable in %p\n", this);
//ALOGI("Destroying ResTable in %p\n", this);
uninit();
}
@ -1881,7 +1881,7 @@ status_t ResTable::add(const void* data, size_t size, void* cookie,
header->header = (const ResTable_header*)data;
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);
LOAD_TABLE_NOISY(LOGV("Loading ResTable @%p:\n", header->header));
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;
}
*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;
}
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(
ResTable_config thisConfig;
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 "
"swdp:%d wdp:%d hdp:%d\n",
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)
{
//android_writevLog(&vec, N); <-- this is now a no-op
if (N != 1) LOGI("WARNING: writeLines N=%d\n", N);
LOGI("%.*s", vec.iov_len, (const char*) vec.iov_base);
if (N != 1) ALOGI("WARNING: writeLines N=%d\n", N);
ALOGI("%.*s", vec.iov_len, (const char*) vec.iov_base);
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)));
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);
return false;
}
@ -218,7 +218,7 @@ bool ZipFileRO::mapCentralDirectory(void)
{
unsigned int header = get4LE(scanBuf);
if (header == kEOCDSignature) {
LOGI("Found Zip archive, but it looks empty\n");
ALOGI("Found Zip archive, but it looks empty\n");
free(scanBuf);
return false;
} else if (header != kLFHSignature) {
@ -761,7 +761,7 @@ bool ZipFileRO::uncompressEntry(ZipEntryRO entry, int fd) const
(ZD_TYPE) actual, (ZD_TYPE) uncompLen);
goto unmap;
} else {
LOGI("+++ successful write\n");
ALOGI("+++ successful write\n");
}
} else {
if (!inflateBuffer(fd, ptr, uncompLen, compLen))