summaryrefslogtreecommitdiff
path: root/media/libmediaplayerservice/MediaPlayerService.cpp
diff options
context:
space:
mode:
author Jean-Baptiste Queru <jbq@google.com> 2012-01-19 17:28:26 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2012-01-19 17:28:26 -0800
commitdb2b39300a8f763cf2d0c9808deb86db87d5492c (patch)
treefce1cbeaacc788437bfba6ae0655e93fd74c9271 /media/libmediaplayerservice/MediaPlayerService.cpp
parentdde686e2bdf7ea679dae4fd4edbf94c71802dc28 (diff)
parentf3f650db96d40014a0203393c585c368b0dd7a9a (diff)
am f3f650db: am a826f9e2: Merge "Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)"
* commit 'f3f650db96d40014a0203393c585c368b0dd7a9a': Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)
Diffstat (limited to 'media/libmediaplayerservice/MediaPlayerService.cpp')
-rw-r--r--media/libmediaplayerservice/MediaPlayerService.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/media/libmediaplayerservice/MediaPlayerService.cpp b/media/libmediaplayerservice/MediaPlayerService.cpp
index bf0a6267f241..91221acba4da 100644
--- a/media/libmediaplayerservice/MediaPlayerService.cpp
+++ b/media/libmediaplayerservice/MediaPlayerService.cpp
@@ -1772,7 +1772,7 @@ void MediaPlayerService::addBatteryData(uint32_t params)
} else if (params & kBatteryDataAudioFlingerStop) {
if (mBatteryAudio.refCount <= 0) {
- LOGW("Battery track warning: refCount is <= 0");
+ ALOGW("Battery track warning: refCount is <= 0");
return;
}
@@ -1825,7 +1825,7 @@ void MediaPlayerService::addBatteryData(uint32_t params)
}
} else {
if (info.refCount == 0) {
- LOGW("Battery track warning: refCount is already 0");
+ ALOGW("Battery track warning: refCount is already 0");
return;
} else if (info.refCount < 0) {
LOGE("Battery track error: refCount < 0");