diff options
author | Eino-Ville Talvala <etalvala@google.com> | 2014-09-09 11:42:43 -0700 |
---|---|---|
committer | Eino-Ville Talvala <etalvala@google.com> | 2014-09-09 12:38:12 -0700 |
commit | ee7ea8534067fd83ce4e446da5fd8b538cc2c444 (patch) | |
tree | c8ce40c9657a839e16c25606e057b33e4013c0e1 /core/java | |
parent | e8df3093f53fa992f89e019b2fc87ff4fac0f335 (diff) | |
download | frameworks_base-ee7ea8534067fd83ce4e446da5fd8b538cc2c444.zip frameworks_base-ee7ea8534067fd83ce4e446da5fd8b538cc2c444.tar.gz frameworks_base-ee7ea8534067fd83ce4e446da5fd8b538cc2c444.tar.bz2 |
Camera2: Allow captures right after abort
Since implementation is still largely synchronous, this is safe.
For the future full-asynchronous implementation, this is the behavior
we want in any case.
Bug: 17345630
Change-Id: Ib54a3441b21fa8cb42bcc6548e5639d9db7ec193
Diffstat (limited to 'core/java')
-rw-r--r-- | core/java/android/hardware/camera2/impl/CameraCaptureSessionImpl.java | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/core/java/android/hardware/camera2/impl/CameraCaptureSessionImpl.java b/core/java/android/hardware/camera2/impl/CameraCaptureSessionImpl.java index 843f117..0057f61 100644 --- a/core/java/android/hardware/camera2/impl/CameraCaptureSessionImpl.java +++ b/core/java/android/hardware/camera2/impl/CameraCaptureSessionImpl.java @@ -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( |