commit 911a13b29bfed85ae22d117954b6cd63cac4195d
author Jayant Chowdhary <jchowdhary@google.com> Thu Mar 05 15:22:46 2020 -0800
committer Jayant Chowdhary <jchowdhary@google.com> Thu Mar 12 15:17:10 2020 -0700
tree 9fca529f92fe0b9e17dad9fd66b540217c38921c
parent 904b623c8cdbd43a2089c5d3b45240757bd3bc81

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

Bug: 147402004

Test: make hidl connectDevice return Status::DISCONNECTED.
      Run AImageReaderVendorTest. See that
      ACameraManager::openCamera() returns ACAMERA_ERROR_DISCONNECTED.

Change-Id: I3bcf0be54d1b9e88baa0b22350d74c0370ad23a6
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>

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 a95fe2a..e2097b5 100644
--- a/camera/ndk/ndk_vendor/impl/ACameraManager.cpp
+++ b/camera/ndk/ndk_vendor/impl/ACameraManager.cpp
@@ -735,9 +735,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__);