@ -91,7 +91,7 @@ abstract class CameraController implements
mFrameManager = new FrameManager(2, this);
}
void setPreview(CameraPreview cameraPreview) {
void setPreview(@NonNull CameraPreview cameraPreview) {
mPreview = cameraPreview;
mPreview.setSurfaceCallback(this);
@ -601,8 +601,8 @@ public class CameraView extends FrameLayout implements LifecycleObserver {
@OnLifecycleEvent(Lifecycle.Event.ON_RESUME)
public void open() {
if (!isEnabled()) return;
if (mCameraPreview != null) mCameraPreview.onResume();
if (mCameraPreview == null) return; // Don't want to start without a preview
mCameraPreview.onResume();
if (checkPermissions(getAudio())) {
// Update display orientation for current CameraController
mOrientationHelper.enable(getContext());