Skip to content

Commit 5555324

Browse files
authored
[CameraView] Android - Fix SetSurfaceProvider crash (#2449)
1 parent 20c9f1a commit 5555324

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/CommunityToolkit.Maui.Camera/CameraManager.android.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ protected virtual async partial Task PlatformConnectCamera(CancellationToken tok
172172

173173
protected async Task StartUseCase(CancellationToken token)
174174
{
175-
if (resolutionSelector is null)
175+
if (resolutionSelector is null || cameraExecutor is null)
176176
{
177177
return;
178178
}
@@ -183,7 +183,7 @@ protected async Task StartUseCase(CancellationToken token)
183183
imageCapture?.Dispose();
184184

185185
cameraPreview = new Preview.Builder().SetResolutionSelector(resolutionSelector).Build();
186-
cameraPreview.SetSurfaceProvider(previewView?.SurfaceProvider);
186+
cameraPreview.SetSurfaceProvider(cameraExecutor, previewView?.SurfaceProvider);
187187

188188
imageCapture = new ImageCapture.Builder()
189189
.SetCaptureMode(ImageCapture.CaptureModeMaximizeQuality)

src/CommunityToolkit.Maui.Camera/CommunityToolkit.Maui.Camera.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@
5151
</ItemGroup>
5252

5353
<ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">
54-
<PackageReference Include="Xamarin.AndroidX.Camera.Camera2" Version="1.3.1.1" />
55-
<PackageReference Include="Xamarin.AndroidX.Camera.View" Version="1.3.1.1" />
54+
<PackageReference Include="Xamarin.AndroidX.Camera.Camera2" Version="1.4.1" />
55+
<PackageReference Include="Xamarin.AndroidX.Camera.View" Version="1.4.1" />
5656

5757
<!-- Ensure Linker does not remove required libraries -->
5858
<None Include="linker.xml" Pack="true" PackagePath="build\$(PackageId).LinkerConfigurationFile.xml" />

0 commit comments

Comments
 (0)