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

Commit ce554fe7 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "camera2 ndk: Fix vndk error return value for ACameraManager::OpenCamera()." am: 5995f214

Change-Id: I9994a5612b759400f7a6681df434ff44a048e74a
parents acff0376 5995f214
Loading
Loading
Loading
Loading
+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__);