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

am 557fab42: am 74fc1837: Merge "Fix CameraManager#open exception handling." into mnc-dev

Browse Source 
* commit '557fab42fae1347bd9137a376747a8fbd7612103':
  Fix CameraManager#open exception handling.
This commit is contained in:
Ruben Brunk
2015-06-04 21:09:13 +00:00
committed by Android Git Automerger
parent e2ab7a29c4 557fab42fa
commit 9ff782f255
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -906,7 +906,6 @@ public class CameraDeviceImpl extends CameraDevice {
} }
mRemoteDevice = null; mRemoteDevice = null;
mInError = false;
} }
} }
@@ -1889,13 +1888,13 @@ public class CameraDeviceImpl extends CameraDevice {
} }
private void checkIfCameraClosedOrInError() throws CameraAccessException { private void checkIfCameraClosedOrInError() throws CameraAccessException {
if (mRemoteDevice == null) {
throw new IllegalStateException("CameraDevice was already closed");
}
if (mInError) { if (mInError) {
throw new CameraAccessException(CameraAccessException.CAMERA_ERROR, throw new CameraAccessException(CameraAccessException.CAMERA_ERROR,
"The camera device has encountered a serious error"); "The camera device has encountered a serious error");
} }
if (mRemoteDevice == null) {
throw new IllegalStateException("CameraDevice was already closed");
}
} }
/** Whether the camera device has started to close (may not yet have finished) */ /** Whether the camera device has started to close (may not yet have finished) */