am f267dd1d: Merge "Fix CameraService error flag when running HAL1 with API2." into klp-dev

* commit 'f267dd1d794237229fe71f37d54896ce54c9750d':
  Fix CameraService error flag when running HAL1 with API2.
This commit is contained in:
Ruben Brunk
2013-09-04 18:28:05 -07:00
committed by Android Git Automerger

View File

@@ -49,7 +49,7 @@ public class CameraBinderDecorator {
public static final int EACCES = -13;
public static final int EBUSY = -16;
public static final int ENODEV = -19;
public static final int ENOTSUP = -129;
public static final int EOPNOTSUPP = -95;
private static class CameraBinderDecoratorListener implements Decorator.DecoratorListener {
@@ -86,7 +86,7 @@ public class CameraBinderDecorator {
case ENODEV:
UncheckedThrow.throwAnyException(new CameraRuntimeException(
CAMERA_DISCONNECTED));
case ENOTSUP:
case EOPNOTSUPP:
UncheckedThrow.throwAnyException(new CameraRuntimeException(
CAMERA_DEPRECATED_HAL));
}