Merge "Camera2: Handle getting input surface failures" into mnc-dev (563d60e0) · Commits · e / os / android_frameworks_base

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

+7 −3

Original line number	Original line	Diff line number	Diff line
	@@ -540,9 +540,13 @@ public class CameraDeviceImpl extends CameraDevice {
	// configure streams and then block until IDLE		// configure streams and then block until IDLE
	configureSuccess = configureStreamsChecked(inputConfig, outputConfigurations,		configureSuccess = configureStreamsChecked(inputConfig, outputConfigurations,
	isConstrainedHighSpeed);		isConstrainedHighSpeed);
	if (inputConfig != null) {		if (configureSuccess == true && inputConfig != null) {
	input = new Surface();		input = new Surface();
			try {
	mRemoteDevice.getInputSurface(/out/input);		mRemoteDevice.getInputSurface(/out/input);
			} catch (CameraRuntimeException e) {
			e.asChecked();
			}
	}		}
	} catch (CameraAccessException e) {		} catch (CameraAccessException e) {
	configureSuccess = false;		configureSuccess = false;