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

Commit 5e4730c6 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "camera2 ndk: Fix vndk error return value for... 

Merge "camera2 ndk: Fix vndk error return value for ACameraManager::OpenCamera()." into rvc-dev am: 4cfc33a8

Change-Id: I53c0ab49cf76974cad1724f4d3e40677d2e1d0ae
parents 53f533c4 4cfc33a8

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__);