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

Commit b026bb1d authored by Eino-Ville Talvala's avatar Eino-Ville Talvala Committed by Android (Google) Code Review
Browse files

Merge "Camera: Don't crash when the device has no vendor tags." into nyc-dev

parents 0494ebbe 1e74e241
Loading
Loading
Loading
Loading
+4 −2
Original line number Diff line number Diff line
@@ -658,8 +658,10 @@ Status CameraService::getCameraVendorTagDescriptor(
        ALOGE("%s: camera hardware module doesn't exist", __FUNCTION__);
        return STATUS_ERROR(ERROR_DISCONNECTED, "Camera subsystem not available");
    }

    *desc = *(VendorTagDescriptor::getGlobalVendorTagDescriptor().get());
    sp<VendorTagDescriptor> globalDescriptor = VendorTagDescriptor::getGlobalVendorTagDescriptor();
    if (globalDescriptor != nullptr) {
        *desc = *(globalDescriptor.get());
    }
    return Status::ok();
}