Skip to content
Snippets Groups Projects
Unverified Commit ed6c3fb1 authored by akwizgran's avatar akwizgran
Browse files

Expect runtime exceptions from camera API methods.

parent 0f7131b8
No related branches found
No related tags found
No related merge requests found
...@@ -95,6 +95,8 @@ public class CameraView extends SurfaceView implements SurfaceHolder.Callback, ...@@ -95,6 +95,8 @@ public class CameraView extends SurfaceView implements SurfaceHolder.Callback,
previewConsumer.start(camera); previewConsumer.start(camera);
} catch (IOException e) { } catch (IOException e) {
LOG.log(WARNING, "Error starting camera preview", e); LOG.log(WARNING, "Error starting camera preview", e);
} catch (RuntimeException e) {
LOG.log(WARNING, "Error starting camera preview", e);
} }
} }
...@@ -120,7 +122,11 @@ public class CameraView extends SurfaceView implements SurfaceHolder.Callback, ...@@ -120,7 +122,11 @@ public class CameraView extends SurfaceView implements SurfaceHolder.Callback,
} }
if(LOG.isLoggable(INFO)) if(LOG.isLoggable(INFO))
LOG.info("Display orientation " + orientation + " degrees"); LOG.info("Display orientation " + orientation + " degrees");
camera.setDisplayOrientation(orientation); try {
camera.setDisplayOrientation(orientation);
} catch (RuntimeException e) {
LOG.log(WARNING, "Error setting display orientation", e);
}
displayOrientation = orientation; displayOrientation = orientation;
} }
...@@ -227,9 +233,13 @@ public class CameraView extends SurfaceView implements SurfaceHolder.Callback, ...@@ -227,9 +233,13 @@ public class CameraView extends SurfaceView implements SurfaceHolder.Callback,
surfaceHeight = h; surfaceHeight = h;
if (camera == null) return; // We are stopped if (camera == null) return; // We are stopped
stopPreview(); stopPreview();
Parameters params = camera.getParameters(); try {
setPreviewSize(params); Parameters params = camera.getParameters();
applyParameters(params); setPreviewSize(params);
applyParameters(params);
} catch (RuntimeException e) {
LOG.log(WARNING, "Error getting camera parameters", e);
}
startPreview(holder); startPreview(holder);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment