summaryrefslogtreecommitdiffstats
path: root/media/libmedia
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2014-03-26 22:22:23 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-03-26 22:22:24 +0000
commit5c4fa907328c8ee586367272c7525cb87742f14d (patch)
tree072ee3fe93cbcc8505118b51bc371265214036f3 /media/libmedia
parent2301acc6a9c7a3af4ad01f3d1d0f76f13eca7350 (diff)
parentadad3d7d935da176ff24941b4ae9edf7340e9b96 (diff)
downloadframeworks_av-5c4fa907328c8ee586367272c7525cb87742f14d.zip
frameworks_av-5c4fa907328c8ee586367272c7525cb87742f14d.tar.gz
frameworks_av-5c4fa907328c8ee586367272c7525cb87742f14d.tar.bz2
Merge "Use LOG_ALWAYS_FATAL instead of LOG_FATAL"
Diffstat (limited to 'media/libmedia')
-rw-r--r--media/libmedia/AudioTrackShared.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/media/libmedia/AudioTrackShared.cpp b/media/libmedia/AudioTrackShared.cpp
index fdd1a12..58c9fc1 100644
--- a/media/libmedia/AudioTrackShared.cpp
+++ b/media/libmedia/AudioTrackShared.cpp
@@ -200,7 +200,7 @@ status_t ClientProxy::obtainBuffer(Buffer* buffer, const struct timespec *reques
ts = &remaining;
break;
default:
- LOG_FATAL("obtainBuffer() timeout=%d", timeout);
+ LOG_ALWAYS_FATAL("obtainBuffer() timeout=%d", timeout);
ts = NULL;
break;
}
@@ -429,7 +429,7 @@ status_t AudioTrackClientProxy::waitStreamEndDone(const struct timespec *request
ts = &remaining;
break;
default:
- LOG_FATAL("waitStreamEndDone() timeout=%d", timeout);
+ LOG_ALWAYS_FATAL("waitStreamEndDone() timeout=%d", timeout);
ts = NULL;
break;
}
@@ -470,7 +470,7 @@ StaticAudioTrackClientProxy::StaticAudioTrackClientProxy(audio_track_cblk_t* cbl
void StaticAudioTrackClientProxy::flush()
{
- LOG_FATAL("static flush");
+ LOG_ALWAYS_FATAL("static flush");
}
void StaticAudioTrackClientProxy::setLoop(size_t loopStart, size_t loopEnd, int loopCount)