diff options
| author | Ruben Brunk <rubenbrunk@google.com> | 2013-09-05 01:23:40 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-05 01:23:40 +0000 |
| commit | f267dd1d794237229fe71f37d54896ce54c9750d (patch) | |
| tree | c4d4a2a5d759c245a0a70db339391a02fb408b3c /core/java/android/hardware | |
| parent | 8144585c5853d5f2dd5f30e4ab9c0abe7457d556 (diff) | |
| parent | 6462be7fa0234ca1a285f4f40089f9be1fed8316 (diff) | |
| download | frameworks_base-f267dd1d794237229fe71f37d54896ce54c9750d.zip frameworks_base-f267dd1d794237229fe71f37d54896ce54c9750d.tar.gz frameworks_base-f267dd1d794237229fe71f37d54896ce54c9750d.tar.bz2 | |
Merge "Fix CameraService error flag when running HAL1 with API2." into klp-dev
Diffstat (limited to 'core/java/android/hardware')
| -rw-r--r-- | core/java/android/hardware/camera2/utils/CameraBinderDecorator.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/hardware/camera2/utils/CameraBinderDecorator.java b/core/java/android/hardware/camera2/utils/CameraBinderDecorator.java index fbe7ff4..2c05c58 100644 --- a/core/java/android/hardware/camera2/utils/CameraBinderDecorator.java +++ b/core/java/android/hardware/camera2/utils/CameraBinderDecorator.java @@ -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)); } |