diff options
| author | 2012-09-23 10:14:21 -0700 | |
|---|---|---|
| committer | 2012-09-23 10:14:22 -0700 | |
| commit | a91c9f9f7a3c5d09333bdf27ef06012bb4e7d710 (patch) | |
| tree | eacddc44d163dac85e52b375cc0a8cd0dd948d7c | |
| parent | 7b770b0ec4e5a1b7f1b9601433fb35e55658453d (diff) | |
| parent | 72b4db15b6f30a5bc1c906aece93873b223f7dc2 (diff) | |
Merge "Unhide and document feature android.hardware.camera.any." into jb-mr1-dev
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/content/pm/PackageManager.java | 1 | ||||
| -rw-r--r-- | docs/html/guide/topics/manifest/uses-feature-element.jd | 8 |
3 files changed, 8 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt index babeb6ce264c..0b759b2aae56 100644 --- a/api/current.txt +++ b/api/current.txt @@ -6619,6 +6619,7 @@ package android.content.pm { field public static final java.lang.String FEATURE_AUDIO_LOW_LATENCY = "android.hardware.audio.low_latency"; field public static final java.lang.String FEATURE_BLUETOOTH = "android.hardware.bluetooth"; field public static final java.lang.String FEATURE_CAMERA = "android.hardware.camera"; + field public static final java.lang.String FEATURE_CAMERA_ANY = "android.hardware.camera.any"; field public static final java.lang.String FEATURE_CAMERA_AUTOFOCUS = "android.hardware.camera.autofocus"; field public static final java.lang.String FEATURE_CAMERA_FLASH = "android.hardware.camera.flash"; field public static final java.lang.String FEATURE_CAMERA_FRONT = "android.hardware.camera.front"; diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index 59b057a67cc6..291726a78297 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -837,7 +837,6 @@ public abstract class PackageManager { * Feature for {@link #getSystemAvailableFeatures} and * {@link #hasSystemFeature}: The device has at least one camera pointing in * some direction. - * @hide */ @SdkConstant(SdkConstantType.FEATURE) public static final String FEATURE_CAMERA_ANY = "android.hardware.camera.any"; diff --git a/docs/html/guide/topics/manifest/uses-feature-element.jd b/docs/html/guide/topics/manifest/uses-feature-element.jd index a11135688a11..10b5a330b384 100644 --- a/docs/html/guide/topics/manifest/uses-feature-element.jd +++ b/docs/html/guide/topics/manifest/uses-feature-element.jd @@ -561,7 +561,7 @@ is sensitive to delays or lag in sound input or output.</td> </td> </tr> <tr> - <td rowspan="4">Camera</td> + <td rowspan="5">Camera</td> <td><code>android.hardware.camera</code></td> <td>The application uses the device's camera. If the device supports multiple cameras, the application uses the camera that facing @@ -583,6 +583,12 @@ is sensitive to delays or lag in sound input or output.</td> <td><code>android.hardware.camera.front</code></td> <td>Subfeature. The application uses a front-facing camera on the device.</td> </tr> +<tr> + <td><code>android.hardware.camera.any</code></td> + <td>The application uses at least one camera facing in any direction. Use this +in preference to <code>android.hardware.camera</code> if a back-facing camera is +not required.</td> +</tr> <tr> <td rowspan="3">Location</td> |