Merge "Camera2: Allow captures right after abort" into lmp-dev (657d30e7) · Commits · e / os / android_frameworks_base

core/java/android/hardware/camera2/impl/CameraCaptureSessionImpl.java

+0 −11

Original line number	Diff line number	Diff line
		@@ -143,7 +143,6 @@ public class CameraCaptureSessionImpl extends CameraCaptureSession {
		}

		checkNotClosed();
		checkLegalToCapture();

		handler = checkHandler(handler, callback);

		@@ -166,7 +165,6 @@ public class CameraCaptureSessionImpl extends CameraCaptureSession {
		}

		checkNotClosed();
		checkLegalToCapture();

		handler = checkHandler(handler, callback);

		@@ -188,7 +186,6 @@ public class CameraCaptureSessionImpl extends CameraCaptureSession {
		}

		checkNotClosed();
		checkLegalToCapture();

		handler = checkHandler(handler, callback);

		@@ -211,7 +208,6 @@ public class CameraCaptureSessionImpl extends CameraCaptureSession {
		}

		checkNotClosed();
		checkLegalToCapture();

		handler = checkHandler(handler, callback);

		@@ -542,13 +538,6 @@ public class CameraCaptureSessionImpl extends CameraCaptureSession {
		}
		}

		private void checkLegalToCapture() {
		if (mAborting) {
		throw new IllegalStateException(
		"Session is aborting captures; new captures are not permitted");
		}
		}

		private void checkNotClosed() {
		if (mClosed) {
		throw new IllegalStateException(