Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 9d73409e: Merge change Ic5e3d73f into eclair-mr2

Browse Source 
Merge commit '9d73409e76000f06a7ee3395241154a029152483' into eclair-mr2-plus-aosp

* commit '9d73409e76000f06a7ee3395241154a029152483':
  LOG_ASSERT needs a message.
This commit is contained in:
Patrick Scott
2009-10-29 08:16:44 -07:00
committed by Android Git Automerger
parent 6dd8a9351b 9d73409e76
commit 9ad4274588
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
media/libmediaplayerservice/TestPlayerStub.cpp
View File

@@ -176,7 +176,7 @@ status_t TestPlayerStub::resetInternal()
mContentUrl = NULL; mContentUrl = NULL;
if (mPlayer) { if (mPlayer) {
LOG_ASSERT(mDeletePlayer != NULL); LOG_ASSERT(mDeletePlayer != NULL, "mDeletePlayer is null");
(*mDeletePlayer)(mPlayer); (*mDeletePlayer)(mPlayer);
mPlayer = NULL; mPlayer = NULL;
} }