am de1057c4: Unhide new API for supporting multiple cameras.

Merge commit 'de1057c4a6aa41c3b88bcc4fd49d70f973f1d9eb' into gingerbread-plus-aosp

* commit 'de1057c4a6aa41c3b88bcc4fd49d70f973f1d9eb':
  Unhide new API for supporting multiple cameras.

core/java/android/content/pm/PackageManager.java

@@ -654,6 +654,13 @@ public abstract class PackageManager {
     @SdkConstant(SdkConstantType.FEATURE)
     public static final String FEATURE_CAMERA_FLASH = "android.hardware.camera.flash";
 
+    /**
+     * 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

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;