diff options
| author | 2012-01-09 23:24:46 +0000 | |
|---|---|---|
| committer | 2012-01-09 23:24:46 +0000 | |
| commit | 2e681c1b097883f5c327d3c1c77692ecab498a35 (patch) | |
| tree | 7dbf619f6a4e81fd615afc51f5a3b8a4441b167a /libs/utils/RefBase.cpp | |
| parent | 293fa718102353d7b103f10a7c0f580ba87b3a0f (diff) | |
| parent | 08289f55eae5c4127091360e862f78d57ae24c15 (diff) | |
resolved conflicts for merge of 08289f55 to graphics-dev
Change-Id: I2c95cd461e364cbeae7ffbaea7ad5c87713d7df7
Diffstat (limited to 'libs/utils/RefBase.cpp')
| -rw-r--r-- | libs/utils/RefBase.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libs/utils/RefBase.cpp b/libs/utils/RefBase.cpp index 0b7dd92e3297..ad0939e574b2 100644 --- a/libs/utils/RefBase.cpp +++ b/libs/utils/RefBase.cpp @@ -98,7 +98,7 @@ public: #if DEBUG_REFS_FATAL_SANITY_CHECKS LOG_ALWAYS_FATAL("Strong references remain!"); #else - LOGE("Strong references remain:"); + ALOGE("Strong references remain:"); #endif ref_entry* refs = mStrongRefs; while (refs) { @@ -116,7 +116,7 @@ public: #if DEBUG_REFS_FATAL_SANITY_CHECKS LOG_ALWAYS_FATAL("Weak references remain:"); #else - LOGE("Weak references remain!"); + ALOGE("Weak references remain!"); #endif ref_entry* refs = mWeakRefs; while (refs) { @@ -129,7 +129,7 @@ public: } } if (dumpStack) { - LOGE("above errors at:"); + ALOGE("above errors at:"); CallStack stack; stack.update(); stack.dump(); @@ -205,7 +205,7 @@ public: close(rc); ALOGD("STACK TRACE for %p saved in %s", this, name); } - else LOGE("FAILED TO PRINT STACK TRACE for %p in %s: %s", this, + else ALOGE("FAILED TO PRINT STACK TRACE for %p in %s: %s", this, name, strerror(errno)); } } @@ -263,7 +263,7 @@ private: id, mBase, this); #endif - LOGE("RefBase: removing id %p on RefBase %p" + ALOGE("RefBase: removing id %p on RefBase %p" "(weakref_type %p) that doesn't exist!", id, mBase, this); |