am 5f0ef5fb: Fix jpeg callback is lost if setPreviewCallbackWithBuffer has been called. (a08ff8f3) · Commits · e / os / android_frameworks_base

core/jni/android_hardware_Camera.cpp

+14 −25

Original line number	Diff line number	Diff line
		@@ -234,12 +234,9 @@ void JNICameraContext::copyAndPost(JNIEnv* env, const sp<IMemory>& dataPtr, int
		if (heapBase != NULL) {
		const jbyte* data = reinterpret_cast<const jbyte*>(heapBase + offset);

		if (!mManualBufferMode) {
		LOGV("Allocating callback buffer");
		obj = env->NewByteArray(size);
		} else {
		switch (msgType) {
		case CAMERA_MSG_PREVIEW_FRAME: {
		if (msgType == CAMERA_MSG_RAW_IMAGE) {
		obj = getCallbackBuffer(env, &mRawImageCallbackBuffers, size);
		} else if (msgType == CAMERA_MSG_PREVIEW_FRAME && mManualBufferMode) {
		obj = getCallbackBuffer(env, &mCallbackBuffers, size);

		if (mCallbackBuffers.isEmpty()) {
		@@ -251,17 +248,9 @@ void JNICameraContext::copyAndPost(JNIEnv* env, const sp<IMemory>& dataPtr, int
		return;
		}
		}
		break;
		}
		case CAMERA_MSG_RAW_IMAGE: {
		obj = getCallbackBuffer(env, &mRawImageCallbackBuffers, size);
		break;
		}
		default: {
		jniThrowRuntimeException(env, "Unsupported message type");
		return;
		}
		}
		} else {
		LOGV("Allocating callback buffer");
		obj = env->NewByteArray(size);
		}

		if (obj == NULL) {