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

Commit 4b49489c authored by Eino-Ville Talvala's avatar Eino-Ville Talvala
Browse files

CameraBase: Don't return an sp<> by reference 

If the server dies, the binder death callback clears out
the global camera service sp<>, and any current references to it
will become quite unhappy.

Test: Camera CTS passes
Bug: 31992879
Change-Id: I2966bed35d0319e3f26e3d4b1b8dc08006a22348
parent c2f0c73b

camera/CameraBase.cpp

+5 −5
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ namespace { 


// establish binder interface to camera service

template <typename TCam, typename TCamTraits>

const sp<ICameraService>& CameraBase<TCam, TCamTraits>::getCameraService()

const sp<ICameraService> CameraBase<TCam, TCamTraits>::getCameraService()

{

    Mutex::Autolock _l(gLock);

    if (gCameraService.get() == 0) {
@@ -99,7 +99,7 @@ sp<TCam> CameraBase<TCam, TCamTraits>::connect(int cameraId, 
    sp<TCam> c = new TCam(cameraId);

    sp<TCamCallbacks> cl = c;

    status_t status = NO_ERROR;

    const sp<ICameraService>& cs = getCameraService();

    const sp<ICameraService> cs = getCameraService();



    if (cs != 0) {

        TCamConnectService fnConnectService = TCamTraits::fnConnectService;
@@ -196,7 +196,7 @@ int CameraBase<TCam, TCamTraits>::getNumberOfCameras() { 
template <typename TCam, typename TCamTraits>

status_t CameraBase<TCam, TCamTraits>::getCameraInfo(int cameraId,

                               struct CameraInfo* cameraInfo) {

    const sp<ICameraService>& cs = getCameraService();

    const sp<ICameraService> cs = getCameraService();

    if (cs == 0) return UNKNOWN_ERROR;

    return cs->getCameraInfo(cameraId, cameraInfo);

}
@@ -204,7 +204,7 @@ status_t CameraBase<TCam, TCamTraits>::getCameraInfo(int cameraId, 
template <typename TCam, typename TCamTraits>

status_t CameraBase<TCam, TCamTraits>::addServiceListener(

                            const sp<ICameraServiceListener>& listener) {

    const sp<ICameraService>& cs = getCameraService();

    const sp<ICameraService> cs = getCameraService();

    if (cs == 0) return UNKNOWN_ERROR;

    return cs->addListener(listener);

}
@@ -212,7 +212,7 @@ status_t CameraBase<TCam, TCamTraits>::addServiceListener( 
template <typename TCam, typename TCamTraits>

status_t CameraBase<TCam, TCamTraits>::removeServiceListener(

                            const sp<ICameraServiceListener>& listener) {

    const sp<ICameraService>& cs = getCameraService();

    const sp<ICameraService> cs = getCameraService();

    if (cs == 0) return UNKNOWN_ERROR;

    return cs->removeListener(listener);

}

include/camera/CameraBase.h

+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ protected: 
    virtual void                     binderDied(const wp<IBinder>& who);



    // helper function to obtain camera service handle

    static const sp<ICameraService>& getCameraService();

    static const sp<ICameraService> getCameraService();



    sp<TCamUser>                     mCamera;

    status_t                         mStatus;