diff options
| author | Steve Block <steveblock@google.com> | 2012-01-09 18:35:44 +0000 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2012-01-19 14:45:08 -0800 |
| commit | f68633da3ced654a9344b5c3b82f4d1c79b6bd09 (patch) | |
| tree | a3ce92223f977611f6a1ab6710901a68fad8a968 /libs/binder | |
| parent | c6aacce37191e1cc79cfeba13b39899f59c68c3b (diff) | |
| download | frameworks_base-f68633da3ced654a9344b5c3b82f4d1c79b6bd09.zip frameworks_base-f68633da3ced654a9344b5c3b82f4d1c79b6bd09.tar.gz frameworks_base-f68633da3ced654a9344b5c3b82f4d1c79b6bd09.tar.bz2 | |
Rename LOG_ASSERT to ALOG_ASSERT
Change-Id: Ie2c7ea6560656d65bad791a61996174c75677517
Diffstat (limited to 'libs/binder')
| -rw-r--r-- | libs/binder/IPCThreadState.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libs/binder/IPCThreadState.cpp b/libs/binder/IPCThreadState.cpp index a42c336..629b899 100644 --- a/libs/binder/IPCThreadState.cpp +++ b/libs/binder/IPCThreadState.cpp @@ -692,7 +692,7 @@ status_t IPCThreadState::waitForResponse(Parcel *reply, status_t *acquireResult) case BR_ACQUIRE_RESULT: { - LOG_ASSERT(acquireResult != NULL, "Unexpected brACQUIRE_RESULT"); + ALOG_ASSERT(acquireResult != NULL, "Unexpected brACQUIRE_RESULT"); const int32_t result = mIn.readInt32(); if (!acquireResult) continue; *acquireResult = result ? NO_ERROR : INVALID_OPERATION; @@ -703,7 +703,7 @@ status_t IPCThreadState::waitForResponse(Parcel *reply, status_t *acquireResult) { binder_transaction_data tr; err = mIn.read(&tr, sizeof(tr)); - LOG_ASSERT(err == NO_ERROR, "Not enough command data for brREPLY"); + ALOG_ASSERT(err == NO_ERROR, "Not enough command data for brREPLY"); if (err != NO_ERROR) goto finish; if (reply) { @@ -752,7 +752,7 @@ finish: status_t IPCThreadState::talkWithDriver(bool doReceive) { - LOG_ASSERT(mProcess->mDriverFD >= 0, "Binder driver is not opened"); + ALOG_ASSERT(mProcess->mDriverFD >= 0, "Binder driver is not opened"); binder_write_read bwr; @@ -905,7 +905,7 @@ status_t IPCThreadState::executeCommand(int32_t cmd) case BR_ACQUIRE: refs = (RefBase::weakref_type*)mIn.readInt32(); obj = (BBinder*)mIn.readInt32(); - LOG_ASSERT(refs->refBase() == obj, + ALOG_ASSERT(refs->refBase() == obj, "BR_ACQUIRE: object %p does not match cookie %p (expected %p)", refs, obj, refs->refBase()); obj->incStrong(mProcess.get()); @@ -921,7 +921,7 @@ status_t IPCThreadState::executeCommand(int32_t cmd) case BR_RELEASE: refs = (RefBase::weakref_type*)mIn.readInt32(); obj = (BBinder*)mIn.readInt32(); - LOG_ASSERT(refs->refBase() == obj, + ALOG_ASSERT(refs->refBase() == obj, "BR_RELEASE: object %p does not match cookie %p (expected %p)", refs, obj, refs->refBase()); IF_LOG_REMOTEREFS() { @@ -946,7 +946,7 @@ status_t IPCThreadState::executeCommand(int32_t cmd) // NOTE: This assertion is not valid, because the object may no // longer exist (thus the (BBinder*)cast above resulting in a different // memory address). - //LOG_ASSERT(refs->refBase() == obj, + //ALOG_ASSERT(refs->refBase() == obj, // "BR_DECREFS: object %p does not match cookie %p (expected %p)", // refs, obj, refs->refBase()); mPendingWeakDerefs.push(refs); @@ -958,7 +958,7 @@ status_t IPCThreadState::executeCommand(int32_t cmd) { const bool success = refs->attemptIncStrong(mProcess.get()); - LOG_ASSERT(success && refs->refBase() == obj, + ALOG_ASSERT(success && refs->refBase() == obj, "BR_ATTEMPT_ACQUIRE: object %p does not match cookie %p (expected %p)", refs, obj, refs->refBase()); @@ -971,7 +971,7 @@ status_t IPCThreadState::executeCommand(int32_t cmd) { binder_transaction_data tr; result = mIn.read(&tr, sizeof(tr)); - LOG_ASSERT(result == NO_ERROR, + ALOG_ASSERT(result == NO_ERROR, "Not enough command data for brTRANSACTION"); if (result != NO_ERROR) break; @@ -1114,7 +1114,7 @@ void IPCThreadState::freeBuffer(Parcel* parcel, const uint8_t* data, size_t data IF_LOG_COMMANDS() { alog << "Writing BC_FREE_BUFFER for " << data << endl; } - LOG_ASSERT(data != NULL, "Called with NULL data"); + ALOG_ASSERT(data != NULL, "Called with NULL data"); if (parcel != NULL) parcel->closeFileDescriptors(); IPCThreadState* state = self(); state->mOut.writeInt32(BC_FREE_BUFFER); |