diff options
| author | Colin Cross <ccross@android.com> | 2014-03-21 17:43:32 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2014-03-21 17:43:32 -0700 |
| commit | 5c679d41714e42f153f6aeb492df54510a195bc1 (patch) | |
| tree | b8100421f7339771067ad447d94ad2a5f6494068 /services/camera/libcameraservice/api2/CameraDeviceClient.cpp | |
| parent | ba1390335794a38472bf0349568bc4f199dc5c90 (diff) | |
| parent | 3d7c500234d98464d37ba3e1b65cea763b316b69 (diff) | |
| download | frameworks_av-5c679d41714e42f153f6aeb492df54510a195bc1.zip frameworks_av-5c679d41714e42f153f6aeb492df54510a195bc1.tar.gz frameworks_av-5c679d41714e42f153f6aeb492df54510a195bc1.tar.bz2 | |
resolved conflicts for merge of 3d7c5002 to klp-modular-dev-plus-aosp
Change-Id: Ia6d87d56174d1388c1148fb55b6e4bc57d8666db
Diffstat (limited to 'services/camera/libcameraservice/api2/CameraDeviceClient.cpp')
| -rw-r--r-- | services/camera/libcameraservice/api2/CameraDeviceClient.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/camera/libcameraservice/api2/CameraDeviceClient.cpp b/services/camera/libcameraservice/api2/CameraDeviceClient.cpp index 1cdf8dc..142da9e 100644 --- a/services/camera/libcameraservice/api2/CameraDeviceClient.cpp +++ b/services/camera/libcameraservice/api2/CameraDeviceClient.cpp @@ -284,7 +284,7 @@ status_t CameraDeviceClient::createStream(int width, int height, int format, ssize_t index = mStreamMap.indexOfKey(bufferProducer->asBinder()); if (index != NAME_NOT_FOUND) { ALOGW("%s: Camera %d: Buffer producer already has a stream for it " - "(ID %d)", + "(ID %zd)", __FUNCTION__, mCameraId, index); return ALREADY_EXISTS; } |