diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2014-05-09 15:47:58 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-09 15:47:58 +0000 |
| commit | 8bfb3513ee8f0bd6ccd98f347a4cbdf99de703a1 (patch) | |
| tree | 2d365cdba8bd2e533d91a693bc1096e9b4e4fccb /core/java/android/content/pm | |
| parent | 2dc97d48b924e0ea196404d5adbe5084b344d25e (diff) | |
| parent | 1caeb10a7a288d937195d925c52f441f454cbc9a (diff) | |
| download | frameworks_base-8bfb3513ee8f0bd6ccd98f347a4cbdf99de703a1.zip frameworks_base-8bfb3513ee8f0bd6ccd98f347a4cbdf99de703a1.tar.gz frameworks_base-8bfb3513ee8f0bd6ccd98f347a4cbdf99de703a1.tar.bz2 | |
am 1caeb10a: DO NOT MERGE: Add android.hardware.camera.external feature.
* commit '1caeb10a7a288d937195d925c52f441f454cbc9a':
DO NOT MERGE: Add android.hardware.camera.external feature.
Diffstat (limited to 'core/java/android/content/pm')
| -rw-r--r-- | core/java/android/content/pm/PackageManager.java | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index 18ac3fe..2350223 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -913,13 +913,21 @@ public abstract class PackageManager { /** * Feature for {@link #getSystemAvailableFeatures} and * {@link #hasSystemFeature}: The device has at least one camera pointing in - * some direction. + * some direction, or can support an external camera being connected to it. */ @SdkConstant(SdkConstantType.FEATURE) public static final String FEATURE_CAMERA_ANY = "android.hardware.camera.any"; /** * Feature for {@link #getSystemAvailableFeatures} and + * {@link #hasSystemFeature}: The device can support having an external camera connected to it. + * The external camera may not always be connected or available to applications to use. + */ + @SdkConstant(SdkConstantType.FEATURE) + public static final String FEATURE_CAMERA_EXTERNAL = "android.hardware.camera.external"; + + /** + * Feature for {@link #getSystemAvailableFeatures} and * {@link #hasSystemFeature}: The device's camera supports flash. */ @SdkConstant(SdkConstantType.FEATURE) |