diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-02-10 23:01:48 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-02-10 23:01:48 +0000 |
| commit | daa20b72c218cbd7e54c9b78e4b7e14e7f131b3a (patch) | |
| tree | c23b4e99abb8b8c09414b8139b78c71dda65848e /camera/provider/2.4/default/CameraProvider.cpp | |
| parent | a9e8d15a46640a704cfdb6fb7eafcdb03532fdae (diff) | |
| parent | 6dc9b53abebd02ca2bf6e2deb59a90c8520a30ef (diff) | |
| download | android_hardware_interfaces-daa20b72c218cbd7e54c9b78e4b7e14e7f131b3a.tar.gz android_hardware_interfaces-daa20b72c218cbd7e54c9b78e4b7e14e7f131b3a.tar.bz2 android_hardware_interfaces-daa20b72c218cbd7e54c9b78e4b7e14e7f131b3a.zip | |
Merge "Camera: fix open_legacy crash"
Diffstat (limited to 'camera/provider/2.4/default/CameraProvider.cpp')
| -rw-r--r-- | camera/provider/2.4/default/CameraProvider.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/camera/provider/2.4/default/CameraProvider.cpp b/camera/provider/2.4/default/CameraProvider.cpp index f3ba201d7..5714f835b 100644 --- a/camera/provider/2.4/default/CameraProvider.cpp +++ b/camera/provider/2.4/default/CameraProvider.cpp @@ -51,8 +51,7 @@ void CameraProvider::sCameraDeviceStatusChange( const struct camera_module_callbacks* callbacks, int camera_id, int new_status) { - ALOGI("%s++", __FUNCTION__); - sp<CameraProvider> cp = const_cast<CameraProvider*>( + CameraProvider* cp = const_cast<CameraProvider*>( static_cast<const CameraProvider*>(callbacks)); if (cp == nullptr) { @@ -60,7 +59,7 @@ void CameraProvider::sCameraDeviceStatusChange( return; } - ALOGI("%s resolved provider %p", __FUNCTION__, cp.get()); + ALOGI("%s resolved provider %p", __FUNCTION__, cp); Mutex::Autolock _l(cp->mCbLock); char cameraId[kMaxCameraIdLen]; @@ -76,15 +75,13 @@ void CameraProvider::sCameraDeviceStatusChange( } } } - ALOGI("%s--", __FUNCTION__); } void CameraProvider::sTorchModeStatusChange( const struct camera_module_callbacks* callbacks, const char* camera_id, int new_status) { - ALOGI("%s++", __FUNCTION__); - sp<CameraProvider> cp = const_cast<CameraProvider*>( + CameraProvider* cp = const_cast<CameraProvider*>( static_cast<const CameraProvider*>(callbacks)); if (cp == nullptr) { @@ -92,7 +89,7 @@ void CameraProvider::sTorchModeStatusChange( return; } - ALOGI("%s resolved provider %p", __FUNCTION__, cp.get()); + ALOGI("%s resolved provider %p", __FUNCTION__, cp); Mutex::Autolock _l(cp->mCbLock); if (cp->mCallbacks != nullptr) { @@ -105,7 +102,6 @@ void CameraProvider::sTorchModeStatusChange( } } } - ALOGI("%s--", __FUNCTION__); } Status CameraProvider::getHidlStatus(int status) { |