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

Commit 07b88fef authored by Wu-cheng Li's avatar Wu-cheng Li
Browse files

android.hardware.Camera.open only returns back-facing camera.

bug:3173302
Change-Id: I813e41b36c776246f151b66ef289cdf13a05dc2c
parent 31dc911a
Loading
Loading
Loading
Loading
+0 −10
Original line number Diff line number Diff line
@@ -73399,16 +73399,6 @@
 visibility="public"
>
</field>
<field name="CAMERA_ID_DEFAULT"
 type="int"
 transient="false"
 volatile="false"
 static="true"
 final="false"
 deprecated="not deprecated"
 visibility="public"
>
</field>
</class>
<interface name="Camera.AutoFocusCallback"
 abstract="true"
+13 −11
Original line number Diff line number Diff line
@@ -211,8 +211,7 @@ public class Camera {
     * blocking the main application UI thread.
     *
     * @param cameraId the hardware camera to access, between 0 and
     *     {@link #getNumberOfCameras()}-1.  Use {@link #CAMERA_ID_DEFAULT}
     *     to access the default camera.
     *     {@link #getNumberOfCameras()}-1.
     * @return a new Camera object, connected, locked and ready for use.
     * @throws RuntimeException if connection to the camera service fails (for
     *     example, if the camera is in use by another process).
@@ -222,18 +221,21 @@ public class Camera {
    }

    /**
     * The id for the default camera.
     * @see #open(int)
     */
    public static int CAMERA_ID_DEFAULT = 0;

    /**
     * Equivalent to Camera.open(Camera.CAMERA_ID_DEFAULT).
     * Creates a new Camera object to access the default camera.
     * Creates a new Camera object to access the first back-facing camera on the
     * device. If the device does not have a back-facing camera, this returns
     * null.
     * @see #open(int)
     */
    public static Camera open() {
        return new Camera(CAMERA_ID_DEFAULT);
        int numberOfCameras = getNumberOfCameras();
        CameraInfo cameraInfo = new CameraInfo();
        for (int i = 0; i < numberOfCameras; i++) {
            getCameraInfo(i, cameraInfo);
            if (cameraInfo.facing == CameraInfo.CAMERA_FACING_BACK) {
                return new Camera(i);
            }
        }
        return null;
    }

    Camera(int cameraId) {