diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2014-06-11 18:18:54 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-11 18:18:54 +0000 |
| commit | 6415ef3f791a0f4032af250e3b5e11f0e6289a2e (patch) | |
| tree | 2ec32686933602cfeecc52556d0104ebd27b47d6 /camera | |
| parent | 6b8f47f224534952c12628cbc382f10a5ade5b4f (diff) | |
| parent | dd80baf5413e3fb5ce5e1282ce9c0badd0b081f1 (diff) | |
| download | frameworks_av-6415ef3f791a0f4032af250e3b5e11f0e6289a2e.zip frameworks_av-6415ef3f791a0f4032af250e3b5e11f0e6289a2e.tar.gz frameworks_av-6415ef3f791a0f4032af250e3b5e11f0e6289a2e.tar.bz2 | |
am dd80baf5: am 1f15b117: Merge "libcamera_client: 64-bit compile issue"
* commit 'dd80baf5413e3fb5ce5e1282ce9c0badd0b081f1':
libcamera_client: 64-bit compile issue
Diffstat (limited to 'camera')
| -rw-r--r-- | camera/CameraBase.cpp | 4 | ||||
| -rw-r--r-- | camera/CameraParameters.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/camera/CameraBase.cpp b/camera/CameraBase.cpp index 55376b0..04694cd 100644 --- a/camera/CameraBase.cpp +++ b/camera/CameraBase.cpp @@ -49,7 +49,7 @@ namespace { DeathNotifier() { } - virtual void binderDied(const wp<IBinder>& who) { + virtual void binderDied(const wp<IBinder>& /*who*/) { ALOGV("binderDied"); Mutex::Autolock _l(gLock); gCameraService.clear(); @@ -153,7 +153,7 @@ status_t CameraBase<TCam, TCamTraits>::getStatus() } template <typename TCam, typename TCamTraits> -void CameraBase<TCam, TCamTraits>::binderDied(const wp<IBinder>& who) { +void CameraBase<TCam, TCamTraits>::binderDied(const wp<IBinder>& /*who*/) { ALOGW("mediaserver's remote binder Camera object died"); notifyCallback(CAMERA_MSG_ERROR, CAMERA_ERROR_SERVER_DIED, /*ext2*/0); } diff --git a/camera/CameraParameters.cpp b/camera/CameraParameters.cpp index 161f842..25d632d 100644 --- a/camera/CameraParameters.cpp +++ b/camera/CameraParameters.cpp @@ -457,7 +457,7 @@ const char *CameraParameters::getPictureFormat() const void CameraParameters::dump() const { - ALOGD("dump: mMap.size = %d", mMap.size()); + ALOGD("dump: mMap.size = %zu", mMap.size()); for (size_t i = 0; i < mMap.size(); i++) { String8 k, v; k = mMap.keyAt(i); @@ -466,7 +466,7 @@ void CameraParameters::dump() const } } -status_t CameraParameters::dump(int fd, const Vector<String16>& args) const +status_t CameraParameters::dump(int fd, const Vector<String16>& /*args*/) const { const size_t SIZE = 256; char buffer[SIZE]; |