diff options
| author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2017-05-02 19:21:00 +0200 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2017-05-02 19:21:00 +0200 |
| commit | eca582052ef000897f69d6d0bdd96c7a8aa59cda (patch) | |
| tree | 7472d8773c4bb9321fdd41d0aef057e30045e557 /camera | |
| parent | 26718276fd99ef60d9646d79467d2bb3f2db5549 (diff) | |
| parent | dc7805b0c79d056385a076422894425984af2aa0 (diff) | |
| download | frameworks_av-replicant-6.0.zip frameworks_av-replicant-6.0.tar.gz frameworks_av-replicant-6.0.tar.bz2 | |
Merge branch 'cm-13.0' of https://github.com/LineageOS/android_frameworks_av into replicant-6.0HEADreplicant-6.0-0001replicant-6.0
Diffstat (limited to 'camera')
| -rw-r--r-- | camera/CameraBase.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/camera/CameraBase.cpp b/camera/CameraBase.cpp index 5d50aa8..871dcea 100644 --- a/camera/CameraBase.cpp +++ b/camera/CameraBase.cpp @@ -65,7 +65,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) { @@ -98,7 +98,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; @@ -195,7 +195,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); } @@ -203,7 +203,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); } @@ -211,7 +211,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); } |