diff options
| author | Patrick Scott <phanna@android.com> | 2009-10-29 08:40:25 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-10-29 08:40:25 -0700 |
| commit | 590dfffe1ab99a9e7889aa7729c1a4cb7b2274ec (patch) | |
| tree | 05f9545850c095384cf9506b05df9751cf6df7eb | |
| parent | cf90c4a9fa4caa08d918e6845d2961ef9e5de882 (diff) | |
| parent | 9ad4274588374df796f7fb9f35d44476fc50c8de (diff) | |
| download | frameworks_base-590dfffe1ab99a9e7889aa7729c1a4cb7b2274ec.zip frameworks_base-590dfffe1ab99a9e7889aa7729c1a4cb7b2274ec.tar.gz frameworks_base-590dfffe1ab99a9e7889aa7729c1a4cb7b2274ec.tar.bz2 | |
am 9ad42745: am 9d73409e: Merge change Ic5e3d73f into eclair-mr2
Merge commit '9ad4274588374df796f7fb9f35d44476fc50c8de'
* commit '9ad4274588374df796f7fb9f35d44476fc50c8de':
LOG_ASSERT needs a message.
| -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; } |