diff options
| author | Patrick Scott <phanna@android.com> | 2009-10-29 08:16:44 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-10-29 08:16:44 -0700 |
| commit | 9ad4274588374df796f7fb9f35d44476fc50c8de (patch) | |
| tree | b2f0be8506171d9c53fc20ee80ecf645dc123830 /media | |
| parent | 6dd8a9351b651c8e85271660fcb2db80328a7b94 (diff) | |
| parent | 9d73409e76000f06a7ee3395241154a029152483 (diff) | |
| download | frameworks_base-9ad4274588374df796f7fb9f35d44476fc50c8de.zip frameworks_base-9ad4274588374df796f7fb9f35d44476fc50c8de.tar.gz frameworks_base-9ad4274588374df796f7fb9f35d44476fc50c8de.tar.bz2 | |
am 9d73409e: Merge change Ic5e3d73f into eclair-mr2
Merge commit '9d73409e76000f06a7ee3395241154a029152483' into eclair-mr2-plus-aosp
* commit '9d73409e76000f06a7ee3395241154a029152483':
LOG_ASSERT needs a message.
Diffstat (limited to 'media')
| -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; } |