Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dd80baf5 authored by Mark Salyzyn's avatar Mark Salyzyn Committed by Android Git Automerger
Browse files

am 1f15b117: Merge "libcamera_client: 64-bit compile issue" 

* commit '1f15b117':
  libcamera_client: 64-bit compile issue
parents 4299a7c2 1f15b117

camera/CameraBase.cpp

+2 −2
Original line number Diff line number Diff line
@@ -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);

}

camera/CameraParameters.cpp

+2 −2
Original line number Diff line number Diff line
@@ -456,7 +456,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);
@@ -465,7 +465,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];