commit 74476ff539428b9454b6726b7aee06efd3b86e0c
author Eino-Ville Talvala <etalvala@google.com> Thu Feb 02 23:59:31 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Feb 02 23:59:31 2017 +0000
tree d554a81d973a79615bd0f9b2c6b7c4e6c21c2074
parent ee721d879ca73e53bc86550b5f81e128ab01d9d5
parent 4f951572955e2d7c39bd629ddbfb45d4c05a93b9

CameraBase: Don't return an sp<> by reference am: f86177dd93 am: e1bdaa8fb1 am: 6cb1912505
am: 4f95157295

Change-Id: I25e6c61da37ba8efa681777ea7e11af7caf3f324

camera/CameraBase.cpp

diff --git a/camera/CameraBase.cpp b/camera/CameraBase.cpp
index 194e1d3..8a18d2f 100644
--- a/camera/CameraBase.cpp
+++ b/camera/CameraBase.cpp
@@ -87,7 +87,7 @@
 
 // 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 @@
     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 @@
 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();

include/camera/CameraBase.h

diff --git a/include/camera/CameraBase.h b/include/camera/CameraBase.h
index 0692a27..41f8621 100644
--- a/include/camera/CameraBase.h
+++ b/include/camera/CameraBase.h
@@ -115,7 +115,7 @@
     virtual void                     binderDied(const wp<IBinder>& who);
 
     // helper function to obtain camera service handle
-    static const sp<::android::hardware::ICameraService>& getCameraService();
+    static const sp<::android::hardware::ICameraService> getCameraService();
 
     sp<TCamUser>                     mCamera;
     status_t                         mStatus;