diff options
| author | Zhijun He <zhijunhe@google.com> | 2013-09-23 19:33:07 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-09-23 19:33:07 -0700 |
| commit | ff704b63dda946531b7e3774b2ac4211f63349c3 (patch) | |
| tree | 85ccb69f04bceb4030b1d7db883aa5ff26b26f53 /core/java/android | |
| parent | c8f00291f670cb3741347c82b615a110f5729c6f (diff) | |
| parent | 0d9fdc245172bb5c46eb21094e384d95da1a46df (diff) | |
| download | frameworks_base-ff704b63dda946531b7e3774b2ac4211f63349c3.zip frameworks_base-ff704b63dda946531b7e3774b2ac4211f63349c3.tar.gz frameworks_base-ff704b63dda946531b7e3774b2ac4211f63349c3.tar.bz2 | |
am 0d9fdc24: Merge "Camera2: replace EDQUOT with EUSERS" into klp-dev
* commit '0d9fdc245172bb5c46eb21094e384d95da1a46df':
Camera2: replace EDQUOT with EUSERS
Diffstat (limited to 'core/java/android')
| -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 d0b3ec4..e535e00 100644 --- a/core/java/android/hardware/camera2/utils/CameraBinderDecorator.java +++ b/core/java/android/hardware/camera2/utils/CameraBinderDecorator.java @@ -51,7 +51,7 @@ public class CameraBinderDecorator { public static final int EBUSY = -16; public static final int ENODEV = -19; public static final int EOPNOTSUPP = -95; - public static final int EDQUOT = -122; + public static final int EUSERS = -87; private static class CameraBinderDecoratorListener implements Decorator.DecoratorListener { @@ -85,7 +85,7 @@ public class CameraBinderDecorator { case EBUSY: UncheckedThrow.throwAnyException(new CameraRuntimeException( CAMERA_IN_USE)); - case EDQUOT: + case EUSERS: UncheckedThrow.throwAnyException(new CameraRuntimeException( MAX_CAMERAS_IN_USE)); case ENODEV: |