Merge "Report camera state as CLOSING for runtime errors" into androi…

…dx-main
team-supercharge · Nov 11, 2024 · 8093686 · 8093686
2 parents ff2f474 + 7e1657a
commit 8093686
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/camera/camera-camera2/src/main/java/androidx/camera/camera2/internal/Camera2CameraImpl.java b/camera/camera-camera2/src/main/java/androidx/camera/camera2/internal/Camera2CameraImpl.java
@@ -1973,7 +1973,6 @@ void setState(@NonNull InternalState state, @Nullable CameraState.StateError sta
         State publicState;
         switch (state) {
             case INITIALIZED:
-            case OPENING_WITH_ERROR:
                 publicState = State.CLOSED;
                 break;
             case PENDING_OPEN:
@@ -1991,6 +1990,7 @@ void setState(@NonNull InternalState state, @Nullable CameraState.StateError sta
                 break;
             case CLOSING:
             case REOPENING_QUIRK:
+            case OPENING_WITH_ERROR:
                 publicState = State.CLOSING;
                 break;
             case RELEASING: