diff options
| author | Chih-Chung Chang <chihchung@google.com> | 2010-06-14 19:15:00 +0800 |
|---|---|---|
| committer | Chih-Chung Chang <chihchung@google.com> | 2010-06-28 11:12:45 +0800 |
| commit | de1057c4a6aa41c3b88bcc4fd49d70f973f1d9eb (patch) | |
| tree | d790c64dacf493c1557163754573cba9303b6b9d /core/java | |
| parent | 9005e7f4297a3f04263e81cb61ba2703d5667b0a (diff) | |
| download | frameworks_base-de1057c4a6aa41c3b88bcc4fd49d70f973f1d9eb.zip frameworks_base-de1057c4a6aa41c3b88bcc4fd49d70f973f1d9eb.tar.gz frameworks_base-de1057c4a6aa41c3b88bcc4fd49d70f973f1d9eb.tar.bz2 | |
Unhide new API for supporting multiple cameras.
Change-Id: I916a536c80330444a15986ba380205a6deed2390
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/content/pm/PackageManager.java | 7 | ||||
| -rw-r--r-- | core/java/android/hardware/Camera.java | 5 |
2 files changed, 7 insertions, 5 deletions
diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index 196f508..1a5b419 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -656,6 +656,13 @@ public abstract class PackageManager { /** * Feature for {@link #getSystemAvailableFeatures} and + * {@link #hasSystemFeature}: The device has a front facing camera. + */ + @SdkConstant(SdkConstantType.FEATURE) + public static final String FEATURE_CAMERA_FRONT = "android.hardware.camera.front"; + + /** + * Feature for {@link #getSystemAvailableFeatures} and * {@link #hasSystemFeature}: The device supports one or more methods of * reporting current location. */ diff --git a/core/java/android/hardware/Camera.java b/core/java/android/hardware/Camera.java index 64380c5..0a2899f 100644 --- a/core/java/android/hardware/Camera.java +++ b/core/java/android/hardware/Camera.java @@ -85,20 +85,17 @@ public class Camera { /** * Returns the number of Cameras available. - * @hide */ public native static int getNumberOfCameras(); /** * Returns the information about the camera. * If {@link #getNumberOfCameras()} returns N, the valid id is 0 to N-1. - * @hide */ public native static void getCameraInfo(int cameraId, CameraInfo cameraInfo); /** * Information about a camera - * @hide */ public static class CameraInfo { public static final int CAMERA_FACING_BACK = 0; @@ -129,7 +126,6 @@ public class Camera { * Returns a new Camera object. * If {@link #getNumberOfCameras()} returns N, the valid id is 0 to N-1. * The id 0 is the default camera. - * @hide */ public static Camera open(int cameraId) { return new Camera(cameraId); @@ -137,7 +133,6 @@ public class Camera { /** * The id for the default camera. - * @hide */ public static int CAMERA_ID_DEFAULT = 0; |