Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 911a13b2 authored by Jayant Chowdhary's avatar Jayant Chowdhary
Browse files

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: default avatarJayant Chowdhary <jchowdhary@google.com>
parent 904b623c

camera/ndk/ndk_vendor/impl/ACameraManager.cpp

+1 −2
Original line number Diff line number Diff line
@@ -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__);