Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8e8393ae authored by Ruben Brunk's avatar Ruben Brunk Committed by Android Git Automerger
Browse files

am 92d7ed1d: am f267dd1d: Merge "Fix CameraService error flag when running... 

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

* commit '92d7ed1d':
  Fix CameraService error flag when running HAL1 with API2.
parents 1703c54a 92d7ed1d

core/java/android/hardware/camera2/utils/CameraBinderDecorator.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -49,7 +49,7 @@ public class CameraBinderDecorator { 
    public static final int EACCES = -13;

    public static final int EACCES = -13;

    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 ENOTSUP = -129;

    public static final int EOPNOTSUPP = -95;





    private static class CameraBinderDecoratorListener implements Decorator.DecoratorListener {

    private static class CameraBinderDecoratorListener implements Decorator.DecoratorListener {
@@ -86,7 +86,7 @@ public class CameraBinderDecorator { 
                    case ENODEV:

                    case ENODEV:

                        UncheckedThrow.throwAnyException(new CameraRuntimeException(

                        UncheckedThrow.throwAnyException(new CameraRuntimeException(

                                CAMERA_DISCONNECTED));

                                CAMERA_DISCONNECTED));

                    case ENOTSUP:

                    case EOPNOTSUPP:

                        UncheckedThrow.throwAnyException(new CameraRuntimeException(

                        UncheckedThrow.throwAnyException(new CameraRuntimeException(

                                CAMERA_DEPRECATED_HAL));

                                CAMERA_DEPRECATED_HAL));

                }

                }