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

Commit 3f7417cf 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()." am: 5995f214 am: ce554fe7

Change-Id: Ib1a0a1f322ea9b3cbca7ffc3eece6c3e5bd510d7
parents 935a0336 ce554fe7

camera/ndk/ndk_vendor/impl/ACameraManager.cpp

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