commit 5995f2146016068b5619445b2f93372f12b5be51
author Treehugger Robot <treehugger-gerrit@google.com> Mon Mar 16 22:57:29 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Mar 16 22:57:29 2020 +0000
tree 4bfaecbf42f23f203322a3411c05c4d1c13e07e9
parent e4f1dbca673187c0e1a384338845e8b770c8227b
parent 0197292197ea94427199d68536237c7d11d0666d

Merge "camera2 ndk: Fix vndk error return value for ACameraManager::OpenCamera()."

camera/ndk/ndk_vendor/impl/ACameraManager.cpp

diff --git a/camera/ndk/ndk_vendor/impl/ACameraManager.cpp b/camera/ndk/ndk_vendor/impl/ACameraManager.cpp
index 70c887a..9aab29a 100644
--- a/camera/ndk/ndk_vendor/impl/ACameraManager.cpp
+++ b/camera/ndk/ndk_vendor/impl/ACameraManager.cpp
@@ -574,9 +574,8 @@
 
     if (!serviceRet.isOk() || status != Status::NO_ERROR) {
         ALOGE("%s: connect camera device failed", __FUNCTION__);
-        // TODO: Convert serviceRet to camera_status_t
         delete device;
-        return ACAMERA_ERROR_UNKNOWN;
+        return utils::convertFromHidl(status);
     }
     if (deviceRemote == nullptr) {
         ALOGE("%s: connect camera device failed! remote device is null", __FUNCTION__);