summaryrefslogtreecommitdiffstats
path: root/core/java/android/content
diff options
context:
space:
mode:
authorEino-Ville Talvala <etalvala@google.com>2014-05-08 11:39:53 -0700
committerEino-Ville Talvala <etalvala@google.com>2014-05-08 11:53:01 -0700
commit9131da28e17856fa583d42ea23da211f7689487f (patch)
treed3e0ff40e4214e9f6b86f17819b1c6bd48e148d0 /core/java/android/content
parent2322ae82e9bbd0683eb86ae0f70050e76e44a30d (diff)
downloadframeworks_base-9131da28e17856fa583d42ea23da211f7689487f.zip
frameworks_base-9131da28e17856fa583d42ea23da211f7689487f.tar.gz
frameworks_base-9131da28e17856fa583d42ea23da211f7689487f.tar.bz2
Add android.hardware.camera.external feature.
This feature will be listed by Android devices that allow for an external camera to be connected to it. Such camera devices may not always be available or connected. Also clarify that android.hardware.camera.any also encompasses devices that list android.hardware.camera.external. Change-Id: I57497758877e4286c1f0116961731d483b56808f
Diffstat (limited to 'core/java/android/content')
-rw-r--r--core/java/android/content/pm/PackageManager.java10
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 1a003ff..d47e83a 100644
--- a/core/java/android/content/pm/PackageManager.java
+++ b/core/java/android/content/pm/PackageManager.java
@@ -936,13 +936,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)