Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Chien-Yu Chen
2015-06-17 18:02:27 +00:00
committed by Android (Google) Code Review
parent 0f70c41551 c58a602a2f
commit 563d60e03f
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/hardware/camera2/impl/CameraDeviceImpl.java
View File

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