From 911a13b29bfed85ae22d117954b6cd63cac4195d Mon Sep 17 00:00:00 2001
From: Jayant Chowdhary <jchowdhary@google.com>
Date: Thu, 5 Mar 2020 15:22:46 -0800
Subject: [PATCH] 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 | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/camera/ndk/ndk_vendor/impl/ACameraManager.cpp b/camera/ndk/ndk_vendor/impl/ACameraManager.cpp
index a95fe2a20c..e2097b5639 100644
--- a/camera/ndk/ndk_vendor/impl/ACameraManager.cpp
+++ b/camera/ndk/ndk_vendor/impl/ACameraManager.cpp
@@ -735,9 +735,8 @@ ACameraManager::openCamera(
 
     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__);