diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2017-02-03 00:01:53 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-02-03 00:01:53 +0000 |
| commit | 204e2c5ebd4047e417faa985fb0afd4d72f9d844 (patch) | |
| tree | 205f7ef94b173bc0e74fa5f24cc80b37e36b518e /camera/CameraBase.cpp | |
| parent | c5505da9783d88521eb6b7d6ce5f5b908efdd8df (diff) | |
| parent | 43605e237f757113b696c0ffffc7b21c12a1752c (diff) | |
CameraBase: Don't return an sp<> by reference am: f86177dd93 am: e1bdaa8fb1 am: 6cb1912505 am: 4f95157295 am: 7376ce23ad
am: 43605e237f
Change-Id: I35d434f0efc0cc77f7dc839c554fd164ae0ec4e4
Diffstat (limited to 'camera/CameraBase.cpp')
| -rw-r--r-- | camera/CameraBase.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/camera/CameraBase.cpp b/camera/CameraBase.cpp index ece64fdbe8..60effe20ea 100644 --- a/camera/CameraBase.cpp +++ b/camera/CameraBase.cpp @@ -103,7 +103,7 @@ namespace { // establish binder interface to camera service template <typename TCam, typename TCamTraits> -const sp<::android::hardware::ICameraService>& CameraBase<TCam, TCamTraits>::getCameraService() +const sp<::android::hardware::ICameraService> CameraBase<TCam, TCamTraits>::getCameraService() { Mutex::Autolock _l(gLock); if (gCameraService.get() == 0) { @@ -141,7 +141,7 @@ sp<TCam> CameraBase<TCam, TCamTraits>::connect(int cameraId, ALOGV("%s: connect", __FUNCTION__); sp<TCam> c = new TCam(cameraId); sp<TCamCallbacks> cl = c; - const sp<::android::hardware::ICameraService>& cs = getCameraService(); + const sp<::android::hardware::ICameraService> cs = getCameraService(); binder::Status ret; if (cs != nullptr) { @@ -249,7 +249,7 @@ int CameraBase<TCam, TCamTraits>::getNumberOfCameras() { template <typename TCam, typename TCamTraits> status_t CameraBase<TCam, TCamTraits>::getCameraInfo(int cameraId, struct hardware::CameraInfo* cameraInfo) { - const sp<::android::hardware::ICameraService>& cs = getCameraService(); + const sp<::android::hardware::ICameraService> cs = getCameraService(); if (cs == 0) return UNKNOWN_ERROR; binder::Status res = cs->getCameraInfo(cameraId, cameraInfo); return res.isOk() ? OK : res.serviceSpecificErrorCode(); |