summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Eino-Ville Talvala <etalvala@google.com> 2012-09-21 17:57:03 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 2012-09-21 17:57:03 -0700
commitc9108b1856c7b6d98ddc04fbe330df21f2da890d (patch)
treec76ae3fa88c6e9025f179ccf6ae30d0783e60124
parent6eeff850b245bd3be3a0e782cd9f28daadf922dc (diff)
parent752af83e5b28a4225510406a0ec868585caf1ccc (diff)
Merge "Add hardware feature android.hardware.camera.any." into jb-mr1-dev
-rw-r--r--core/java/android/content/pm/PackageManager.java9
1 files changed, 9 insertions, 0 deletions
diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java
index 171ff3f2b94c..59b057a67cc6 100644
--- a/core/java/android/content/pm/PackageManager.java
+++ b/core/java/android/content/pm/PackageManager.java
@@ -835,6 +835,15 @@ 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";
+
+ /**
+ * Feature for {@link #getSystemAvailableFeatures} and
* {@link #hasSystemFeature}: The device's camera supports flash.
*/
@SdkConstant(SdkConstantType.FEATURE)