Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 82a72bbb authored by Patrick Scott's avatar Patrick Scott Committed by Android Git Automerger
Browse files

am 9d73409e: Merge change Ic5e3d73f into eclair-mr2

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

* commit '9d73409e76000f06a7ee3395241154a029152483':
  LOG_ASSERT needs a message.
parents e3c6f7bd b439827c
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -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;
    }