commit 563d60e03f8d5961e5578fca66092bd6b8d5496e
author Chien-Yu Chen <cychen@google.com> Wed Jun 17 18:02:27 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jun 17 18:02:31 2015 +0000
tree 0218324e51c221bf8eee477f059331420cdc914c
parent 0f70c415519f0a89f8ba765f9046802a2223f790
parent c58a602a2f832a1defbfb1d18e2a1c6cd7fb286c

Merge "Camera2: Handle getting input surface failures" into mnc-dev

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

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 @@
             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;