From 11d0d44d583f679638cc927bfffe920e495e90cc Mon Sep 17 00:00:00 2001 From: Zhijun He Date: Wed, 31 Jul 2013 09:50:58 -0700 Subject: Camera: fix the metadate parcel write issue Also rename the frameId to requestId to make it less confusing. Change-Id: I14a20b6fcabb86294afb31fc0c56397e185c1373 --- camera/camera2/ICameraDeviceCallbacks.cpp | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'camera/camera2') diff --git a/camera/camera2/ICameraDeviceCallbacks.cpp b/camera/camera2/ICameraDeviceCallbacks.cpp index 188bd8e..3cec1f4 100644 --- a/camera/camera2/ICameraDeviceCallbacks.cpp +++ b/camera/camera2/ICameraDeviceCallbacks.cpp @@ -57,11 +57,12 @@ public: data.writeNoException(); } - void onResultReceived(int32_t frameId, const CameraMetadata& result) { + void onResultReceived(int32_t requestId, const CameraMetadata& result) { ALOGV("onResultReceived"); Parcel data, reply; data.writeInterfaceToken(ICameraDeviceCallbacks::getInterfaceDescriptor()); - data.writeInt32(frameId); + data.writeInt32(requestId); + data.writeInt32(1); // to mark presence of metadata object result.writeToParcel(&data); remote()->transact(RESULT_RECEIVED, data, &reply, IBinder::FLAG_ONEWAY); data.writeNoException(); @@ -91,10 +92,14 @@ status_t BnCameraDeviceCallbacks::onTransact( case RESULT_RECEIVED: { ALOGV("RESULT_RECEIVED"); CHECK_INTERFACE(ICameraDeviceCallbacks, data, reply); - int32_t frameId = data.readInt32(); + int32_t requestId = data.readInt32(); CameraMetadata result; - result.readFromParcel(const_cast(&data)); - onResultReceived(frameId, result); + if (data.readInt32() != 0) { + result.readFromParcel(const_cast(&data)); + } else { + ALOGW("No metadata object is present in result"); + } + onResultReceived(requestId, result); data.readExceptionCode(); return NO_ERROR; break; -- cgit v1.1