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

am 78a1de65: Merge "Camera2: Add MAX_CAMERAS_IN_USE error case handling" into klp-dev

Browse Source 
* commit '78a1de651968fc67f43fc881bc8ff5ac3ff380c9':
  Camera2: Add MAX_CAMERAS_IN_USE error case handling
This commit is contained in:
Zhijun He
2013-09-16 11:24:30 -07:00
committed by Android Git Automerger
parent 2e10f974b9 78a1de6519
commit e468820757
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/hardware/camera2/utils/CameraBinderDecorator.java
View File

@@ -19,6 +19,7 @@ package android.hardware.camera2.utils;
import static android.hardware.camera2.CameraAccessException.CAMERA_DISABLED; import static android.hardware.camera2.CameraAccessException.CAMERA_DISABLED;
import static android.hardware.camera2.CameraAccessException.CAMERA_DISCONNECTED; import static android.hardware.camera2.CameraAccessException.CAMERA_DISCONNECTED;
import static android.hardware.camera2.CameraAccessException.CAMERA_IN_USE; import static android.hardware.camera2.CameraAccessException.CAMERA_IN_USE;
import static android.hardware.camera2.CameraAccessException.MAX_CAMERAS_IN_USE;
import static android.hardware.camera2.CameraAccessException.CAMERA_DEPRECATED_HAL; import static android.hardware.camera2.CameraAccessException.CAMERA_DEPRECATED_HAL;
import android.os.DeadObjectException; import android.os.DeadObjectException;
@@ -50,6 +51,7 @@ public class CameraBinderDecorator {
public static final int EBUSY = -16; public static final int EBUSY = -16;
public static final int ENODEV = -19; public static final int ENODEV = -19;
public static final int EOPNOTSUPP = -95; public static final int EOPNOTSUPP = -95;
public static final int EDQUOT = -122;
private static class CameraBinderDecoratorListener implements Decorator.DecoratorListener { private static class CameraBinderDecoratorListener implements Decorator.DecoratorListener {
@@ -83,6 +85,9 @@ public class CameraBinderDecorator {
case EBUSY: case EBUSY:
UncheckedThrow.throwAnyException(new CameraRuntimeException( UncheckedThrow.throwAnyException(new CameraRuntimeException(
CAMERA_IN_USE)); CAMERA_IN_USE));
case EDQUOT:
UncheckedThrow.throwAnyException(new CameraRuntimeException(
MAX_CAMERAS_IN_USE));
case ENODEV: case ENODEV:
UncheckedThrow.throwAnyException(new CameraRuntimeException( UncheckedThrow.throwAnyException(new CameraRuntimeException(
CAMERA_DISCONNECTED)); CAMERA_DISCONNECTED));