Merge "Rename LOG_ASSERT to ALOG_ASSERT DO NOT MERGE" (38e90751) · Commits · e / os / android_frameworks_base

core/jni/com_android_internal_content_NativeLibraryHelper.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -308,7 +308,7 @@ iterateOverNativeFiles(JNIEnv *env, jstring javaFilePath, jstring javaCpuAbi, js
		}

		const char* lastSlash = strrchr(fileName, '/');
		LOG_ASSERT(lastSlash != NULL, "last slash was null somehow for %s\n", fileName);
		ALOG_ASSERT(lastSlash != NULL, "last slash was null somehow for %s\n", fileName);

		// Check to make sure the CPU ABI of this file is one we support.
		const char* cpuAbiOffset = fileName + APK_LIB_LEN;

libs/binder/IPCThreadState.cpp

+9 −9

Original line number	Diff line number	Diff line
		@@ -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);

libs/utils/RefBase.cpp

+7 −7

Original line number	Diff line number	Diff line
		@@ -332,7 +332,7 @@ void RefBase::incStrong(const void* id) const

		refs->addStrongRef(id);
		const int32_t c = android_atomic_inc(&refs->mStrong);
		LOG_ASSERT(c > 0, "incStrong() called on %p after last strong ref", refs);
		ALOG_ASSERT(c > 0, "incStrong() called on %p after last strong ref", refs);
		#if PRINT_REFS
		ALOGD("incStrong of %p from %p: cnt=%d\n", this, id, c);
		#endif
		@@ -352,7 +352,7 @@ void RefBase::decStrong(const void* id) const
		#if PRINT_REFS
		ALOGD("decStrong of %p from %p: cnt=%d\n", this, id, c);
		#endif
		LOG_ASSERT(c >= 1, "decStrong() called on %p too many times", refs);
		ALOG_ASSERT(c >= 1, "decStrong() called on %p too many times", refs);
		if (c == 1) {
		refs->mBase->onLastStrongRef(id);
		if ((refs->mFlags&OBJECT_LIFETIME_MASK) == OBJECT_LIFETIME_STRONG) {
		@@ -369,7 +369,7 @@ void RefBase::forceIncStrong(const void* id) const

		refs->addStrongRef(id);
		const int32_t c = android_atomic_inc(&refs->mStrong);
		LOG_ASSERT(c >= 0, "forceIncStrong called on %p after ref count underflow",
		ALOG_ASSERT(c >= 0, "forceIncStrong called on %p after ref count underflow",
		refs);
		#if PRINT_REFS
		ALOGD("forceIncStrong of %p from %p: cnt=%d\n", this, id, c);
		@@ -399,7 +399,7 @@ void RefBase::weakref_type::incWeak(const void* id)
		weakref_impl* const impl = static_cast<weakref_impl*>(this);
		impl->addWeakRef(id);
		const int32_t c = android_atomic_inc(&impl->mWeak);
		LOG_ASSERT(c >= 0, "incWeak called on %p after last weak ref", this);
		ALOG_ASSERT(c >= 0, "incWeak called on %p after last weak ref", this);
		}


		@@ -408,7 +408,7 @@ void RefBase::weakref_type::decWeak(const void* id)
		weakref_impl* const impl = static_cast<weakref_impl*>(this);
		impl->removeWeakRef(id);
		const int32_t c = android_atomic_dec(&impl->mWeak);
		LOG_ASSERT(c >= 1, "decWeak called on %p too many times", this);
		ALOG_ASSERT(c >= 1, "decWeak called on %p too many times", this);
		if (c != 1) return;

		if ((impl->mFlags&OBJECT_LIFETIME_WEAK) == OBJECT_LIFETIME_STRONG) {
		@@ -442,7 +442,7 @@ bool RefBase::weakref_type::attemptIncStrong(const void* id)
		weakref_impl* const impl = static_cast<weakref_impl*>(this);

		int32_t curCount = impl->mStrong;
		LOG_ASSERT(curCount >= 0, "attemptIncStrong called on %p after underflow",
		ALOG_ASSERT(curCount >= 0, "attemptIncStrong called on %p after underflow",
		this);
		while (curCount > 0 && curCount != INITIAL_STRONG_VALUE) {
		if (android_atomic_cmpxchg(curCount, curCount+1, &impl->mStrong) == 0) {
		@@ -503,7 +503,7 @@ bool RefBase::weakref_type::attemptIncWeak(const void* id)
		weakref_impl* const impl = static_cast<weakref_impl*>(this);

		int32_t curCount = impl->mWeak;
		LOG_ASSERT(curCount >= 0, "attemptIncWeak called on %p after underflow",
		ALOG_ASSERT(curCount >= 0, "attemptIncWeak called on %p after underflow",
		this);
		while (curCount > 0) {
		if (android_atomic_cmpxchg(curCount, curCount+1, &impl->mWeak) == 0) {

libs/utils/String16.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -112,7 +112,7 @@ String16::String16(const char16_t* o)
		{
		size_t len = strlen16(o);
		SharedBuffer* buf = SharedBuffer::alloc((len+1)*sizeof(char16_t));
		LOG_ASSERT(buf, "Unable to allocate shared buffer");
		ALOG_ASSERT(buf, "Unable to allocate shared buffer");
		if (buf) {
		char16_t* str = (char16_t*)buf->data();
		strcpy16(str, o);
		@@ -126,7 +126,7 @@ String16::String16(const char16_t* o)
		String16::String16(const char16_t* o, size_t len)
		{
		SharedBuffer* buf = SharedBuffer::alloc((len+1)*sizeof(char16_t));
		LOG_ASSERT(buf, "Unable to allocate shared buffer");
		ALOG_ASSERT(buf, "Unable to allocate shared buffer");
		if (buf) {
		char16_t* str = (char16_t*)buf->data();
		memcpy(str, o, len*sizeof(char16_t));

libs/utils/String8.cpp

+3 −3

Original line number	Diff line number	Diff line
		@@ -80,7 +80,7 @@ static char* allocFromUTF8(const char* in, size_t len)
		{
		if (len > 0) {
		SharedBuffer* buf = SharedBuffer::alloc(len+1);
		LOG_ASSERT(buf, "Unable to allocate shared buffer");
		ALOG_ASSERT(buf, "Unable to allocate shared buffer");
		if (buf) {
		char* str = (char*)buf->data();
		memcpy(str, in, len);
		@@ -103,7 +103,7 @@ static char* allocFromUTF16(const char16_t* in, size_t len)
		}

		SharedBuffer* buf = SharedBuffer::alloc(bytes+1);
		LOG_ASSERT(buf, "Unable to allocate shared buffer");
		ALOG_ASSERT(buf, "Unable to allocate shared buffer");
		if (!buf) {
		return getEmptyString();
		}
		@@ -125,7 +125,7 @@ static char* allocFromUTF32(const char32_t* in, size_t len)
		}

		SharedBuffer* buf = SharedBuffer::alloc(bytes+1);
		LOG_ASSERT(buf, "Unable to allocate shared buffer");
		ALOG_ASSERT(buf, "Unable to allocate shared buffer");
		if (!buf) {
		return getEmptyString();
		}