diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2017-02-02 23:53:02 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-02-02 23:53:02 +0000 |
| commit | 4f951572955e2d7c39bd629ddbfb45d4c05a93b9 (patch) | |
| tree | 9cf094b1904c89d1d20fa90b1cb5ddce2ba49f88 /camera/CameraBase.cpp | |
| parent | 878b27dfbb0f39d70aa33d6853e15cbde768e60a (diff) | |
| parent | 6cb19125052b31023b497b5e2f03f6963f4b48aa (diff) | |
| download | frameworks_av-4f951572955e2d7c39bd629ddbfb45d4c05a93b9.tar.gz frameworks_av-4f951572955e2d7c39bd629ddbfb45d4c05a93b9.tar.bz2 frameworks_av-4f951572955e2d7c39bd629ddbfb45d4c05a93b9.zip | |
CameraBase: Don't return an sp<> by reference am: f86177dd93 am: e1bdaa8fb1
am: 6cb1912505
Change-Id: If68d75e176ef8c2fafe2288307a0b0e724c3f826
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 194e1d3a7c..8a18d2fa71 100644 --- a/camera/CameraBase.cpp +++ b/camera/CameraBase.cpp @@ -87,7 +87,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) { @@ -125,7 +125,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) { @@ -233,7 +233,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(); |