Skip to content

Fix unsupported focus metering crash #490

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
davidjiagoogle merged 13 commits into from
Apr 14, 2026
Merged

Fix unsupported focus metering crash #490

Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
515de73
Fix unsupported focus metering crash
davidjiagoogle Apr 1, 2026
4249029
Update core/camera/src/main/java/com/google/jetpackcamera/core/camera…
davidjiagoogle Apr 3, 2026
472d3b8
Add unit test for IllegalArgumentException in focus metering
davidjiagoogle Apr 3, 2026
8b473b2
Improve FocusMeteringUnitTest: use real CameraX and simulated hardwar…
davidjiagoogle Apr 3, 2026
699de68
Delete FocusMeteringUnitTest and run spotless
davidjiagoogle Apr 3, 2026
56b76b9
Merge branch 'main' into david/zoomTestFail
davidjiagoogle Apr 14, 2026
69b7267
Fix: Check if focus metering is supported before initiating focus req…
davidjiagoogle Apr 14, 2026
ffc8cfd
Merge remote-tracking branch 'origin/david/zoomTestFail' into david/z…
davidjiagoogle Apr 14, 2026
a979860
spotltess
davidjiagoogle Apr 14, 2026
a3401e4
Refactor: Use guard clause for focus metering support check and add u…
davidjiagoogle Apr 14, 2026
3f6d281
Merge origin/david/zoomTestFail to resolve conflict
davidjiagoogle Apr 14, 2026
a651a9d
Remove FocusMeteringTest.kt
davidjiagoogle Apr 14, 2026
8b6e893
Merge branch 'main' into david/zoomTestFail
davidjiagoogle Apr 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion core/camera/src/main/java/com/google/jetpackcamera/core/camera/FocusMetering.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,17 @@ internal suspend fun CameraSessionContext.processFocusMeteringEvents(
}
}

updateFocusState(FocusState.Status.RUNNING)
val meteringPoint = createPoint(event.x, event.y)
val action = FocusMeteringAction.Builder(meteringPoint)
.setAutoCancelDuration(AUTO_FOCUS_TIMEOUT_MILLIS, TimeUnit.MILLISECONDS)
.build()

if (!cameraInfo.isFocusMeteringSupported(action)) {
Log.w(TAG, "Focus metering not supported for action: $action")
return@apply
}

updateFocusState(FocusState.Status.RUNNING)
val completionStatus: FocusState.Status = try {
if (cameraControl.startFocusAndMetering(action).await().isFocusSuccessful) {
FocusState.Status.SUCCESS
Expand All @@ -98,6 +104,9 @@ internal suspend fun CameraSessionContext.processFocusMeteringEvents(
}
} catch (_: CameraControl.OperationCanceledException) {
FocusState.Status.FAILURE
} catch (e: IllegalArgumentException) {
Log.w(TAG, "tapToFocus failed", e)
FocusState.Status.FAILURE
}

Log.d(
Expand Down
Loading