diff options
author | Colin Cross <ccross@android.com> | 2014-03-22 00:23:15 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-03-22 00:23:15 +0000 |
commit | 3d7c500234d98464d37ba3e1b65cea763b316b69 (patch) | |
tree | c8c46021cf9d734226dc2c9f94111bc3d398c015 /services/camera/libcameraservice/CameraService.cpp | |
parent | 24e1bd71ac6850d9062b3bd803b37c0e92f69c7a (diff) | |
parent | 4bd71b4ed6f1825b287e448c336e3e59138c2956 (diff) | |
download | frameworks_av-3d7c500234d98464d37ba3e1b65cea763b316b69.zip frameworks_av-3d7c500234d98464d37ba3e1b65cea763b316b69.tar.gz frameworks_av-3d7c500234d98464d37ba3e1b65cea763b316b69.tar.bz2 |
Merge changes I9f28bc42,I135620e0
* changes:
libcameraservice: build 64-bit
libcameraservice: fix 64-bit print format warnings
Diffstat (limited to 'services/camera/libcameraservice/CameraService.cpp')
-rw-r--r-- | services/camera/libcameraservice/CameraService.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp index 87027f7..fbc56b1 100644 --- a/services/camera/libcameraservice/CameraService.cpp +++ b/services/camera/libcameraservice/CameraService.cpp @@ -196,7 +196,7 @@ void CameraService::onDeviceStatusChanged(int cameraId, */ } - ALOGV("%s: After unplug, disconnected %d clients", + ALOGV("%s: After unplug, disconnected %zu clients", __FUNCTION__, clientsToDisconnect.size()); } |