diff options
| author | Andreas Gampe <agampe@google.com> | 2014-11-07 15:03:46 -0800 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2014-11-07 15:14:02 -0800 |
| commit | dc9c109af815100d497184e6dadebceed7f3bf1d (patch) | |
| tree | 51bb2aa4ff78b0ebcdbe1cc474c76dd2d38d7a37 /libs/androidfw/Asset.cpp | |
| parent | 9a0aa553ad9f6657cbbf0a182566c481e191e6b7 (diff) | |
| parent | 487ae9b8dc3e08c1a830d519a801a07cd59c8f2b (diff) | |
| download | frameworks_base-dc9c109af815100d497184e6dadebceed7f3bf1d.zip frameworks_base-dc9c109af815100d497184e6dadebceed7f3bf1d.tar.gz frameworks_base-dc9c109af815100d497184e6dadebceed7f3bf1d.tar.bz2 | |
resolved conflicts for merge of 487ae9b8 to lmp-mr1-dev-plus-aosp
Change-Id: I395f184d885a7ef30aa113ab01fcaacc94243008
Diffstat (limited to 'libs/androidfw/Asset.cpp')
| -rw-r--r-- | libs/androidfw/Asset.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/libs/androidfw/Asset.cpp b/libs/androidfw/Asset.cpp index 589211f..4b3382e 100644 --- a/libs/androidfw/Asset.cpp +++ b/libs/androidfw/Asset.cpp @@ -45,6 +45,8 @@ using namespace android; # define O_BINARY 0 #endif +static const bool kIsDebug = false; + static Mutex gAssetLock; static int32_t gCount = 0; static Asset* gHead = NULL; @@ -89,7 +91,9 @@ Asset::Asset(void) gTail->mNext = this; gTail = this; } - //ALOGI("Creating Asset %p #%d\n", this, gCount); + if (kIsDebug) { + ALOGI("Creating Asset %p #%d\n", this, gCount); + } } Asset::~Asset(void) @@ -109,7 +113,9 @@ Asset::~Asset(void) mPrev->mNext = mNext; } mNext = mPrev = NULL; - //ALOGI("Destroying Asset in %p #%d\n", this, gCount); + if (kIsDebug) { + ALOGI("Destroying Asset in %p #%d\n", this, gCount); + } } /* |