diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-10-29 11:09:53 -0400 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-10-29 11:09:53 -0400 |
| commit | b439827ca7e2a991055260982952b8fd8bc84fee (patch) | |
| tree | 7e6478afc771e14f5bda0c974b15521d831d8a4b /media/libmediaplayerservice | |
| parent | 4ee1540a3949693693688c2004a56cb42de55160 (diff) | |
| parent | 23e246f7c2a53426b97296ec7780e8dfe80147d4 (diff) | |
| download | frameworks_av-b439827ca7e2a991055260982952b8fd8bc84fee.zip frameworks_av-b439827ca7e2a991055260982952b8fd8bc84fee.tar.gz frameworks_av-b439827ca7e2a991055260982952b8fd8bc84fee.tar.bz2 | |
Merge change Ic5e3d73f into eclair-mr2
* changes:
LOG_ASSERT needs a message.
Diffstat (limited to 'media/libmediaplayerservice')
| -rw-r--r-- | media/libmediaplayerservice/TestPlayerStub.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libmediaplayerservice/TestPlayerStub.cpp b/media/libmediaplayerservice/TestPlayerStub.cpp index 8627708..aa49429 100644 --- a/media/libmediaplayerservice/TestPlayerStub.cpp +++ b/media/libmediaplayerservice/TestPlayerStub.cpp @@ -176,7 +176,7 @@ status_t TestPlayerStub::resetInternal() mContentUrl = NULL; if (mPlayer) { - LOG_ASSERT(mDeletePlayer != NULL); + LOG_ASSERT(mDeletePlayer != NULL, "mDeletePlayer is null"); (*mDeletePlayer)(mPlayer); mPlayer = NULL; } |