Camera.open() should only return back-facing camera.

Also update current.xml and 9.xml. setRotationHint was also
missing from 9.xml.
bug:3173302

Change-Id: Idd3f7417a4d35c65910e9b08a1bfd157b91e1baa
This commit is contained in:
Wu-cheng Li
2010-11-09 01:55:44 +08:00
parent 17ae359721
commit a48b70fa8f
3 changed files with 26 additions and 31 deletions

View File

@@ -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"
@@ -86967,6 +86957,19 @@
<parameter name="listener" type="android.media.MediaRecorder.OnInfoListener">
</parameter>
</method>
<method name="setOrientationHint"
return="void"
abstract="false"
native="false"
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
<parameter name="degrees" type="int">
</parameter>
</method>
<method name="setOutputFile"
return="void"
abstract="false"

View File

@@ -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"

View File

@@ -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) {