diff options
| author | Chien-Yu Chen <cychen@google.com> | 2015-06-17 18:02:27 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-17 18:02:31 +0000 |
| commit | 563d60e03f8d5961e5578fca66092bd6b8d5496e (patch) | |
| tree | 0218324e51c221bf8eee477f059331420cdc914c | |
| parent | 0f70c415519f0a89f8ba765f9046802a2223f790 (diff) | |
| parent | c58a602a2f832a1defbfb1d18e2a1c6cd7fb286c (diff) | |
| download | frameworks_base-563d60e03f8d5961e5578fca66092bd6b8d5496e.zip frameworks_base-563d60e03f8d5961e5578fca66092bd6b8d5496e.tar.gz frameworks_base-563d60e03f8d5961e5578fca66092bd6b8d5496e.tar.bz2 | |
Merge "Camera2: Handle getting input surface failures" into mnc-dev
| -rw-r--r-- | core/java/android/hardware/camera2/impl/CameraDeviceImpl.java | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/core/java/android/hardware/camera2/impl/CameraDeviceImpl.java b/core/java/android/hardware/camera2/impl/CameraDeviceImpl.java index 20ce7a0..83128c3 100644 --- a/core/java/android/hardware/camera2/impl/CameraDeviceImpl.java +++ b/core/java/android/hardware/camera2/impl/CameraDeviceImpl.java @@ -537,12 +537,16 @@ public class CameraDeviceImpl extends CameraDevice { CameraAccessException pendingException = null; Surface input = null; try { - // configure streams and then block until IDLE + // configure streams and then block until IDLE configureSuccess = configureStreamsChecked(inputConfig, outputConfigurations, isConstrainedHighSpeed); - if (inputConfig != null) { + if (configureSuccess == true && inputConfig != null) { input = new Surface(); - mRemoteDevice.getInputSurface(/*out*/input); + try { + mRemoteDevice.getInputSurface(/*out*/input); + } catch (CameraRuntimeException e) { + e.asChecked(); + } } } catch (CameraAccessException e) { configureSuccess = false; |