From 72b4db15b6f30a5bc1c906aece93873b223f7dc2 Mon Sep 17 00:00:00 2001 From: Eino-Ville Talvala Date: Tue, 18 Sep 2012 15:03:27 -0700 Subject: Unhide and document feature android.hardware.camera.any. Bug: 6847310 Change-Id: I67a973dccfdc735aac457fce625003a386ff2fbe --- api/current.txt | 1 + core/java/android/content/pm/PackageManager.java | 1 - 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 0825c6497fb8..42571d1d6ec6 100644 --- a/api/current.txt +++ b/api/current.txt @@ -6618,6 +6618,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 0da9af407212..ba9ee724effe 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. - Camera + Camera android.hardware.camera 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. android.hardware.camera.front Subfeature. The application uses a front-facing camera on the device. + + android.hardware.camera.any + The application uses at least one camera facing in any direction. Use this +in preference to android.hardware.camera if a back-facing camera is +not required. + Location -- cgit v1.2.3-59-g8ed1b